Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev
This commit is contained in:
commit
b6e95690c0
@ -747,7 +747,7 @@ class MerchantRepository extends BaseRepository
|
|||||||
throw new \Exception('merchant 保存出错', 500);
|
throw new \Exception('merchant 保存出错', 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
return [bcsub($income,$margin), $finance, true];
|
return [bcsub($income,$margin,2), $finance, true];
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user