Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev

2023-09-28 18:23:06 +08:00 · 2023-09-28 18:23:06 +08:00 · b6e95690c0
commit b6e95690c0
parent a4fe2b1b32 19267aa12f
1 changed files with 1 additions and 1 deletions
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@ -747,7 +747,7 @@ class MerchantRepository extends BaseRepository
            throw new \Exception('merchant 保存出错', 500);
        }

-        return [bcsub($income,$margin), $finance, true];
+        return [bcsub($income,$margin,2), $finance, true];
    }

 }