Merge remote-tracking branch 'origin/develop' into develop

73c2aa29 · hongguangwu · 3806b041 · 29855a67 · 73c2aa29
Commit 73c2aa29 authored Aug 24, 2022 by hongguangwu
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

SalaryUploadServiceImpl.java .../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java +1 -1

No files found.
--- a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+++ b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
@@ -1878,7 +1878,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		salary.setOwnMoney(ownMoney);

 		for (TSalaryAccount account : aList) {
-			relaySalarySum = relaySalarySum.add(account.getRelaySalaryUnit());
+			relaySalarySum = relaySalarySum.add(account.getRelaySalary());
 		}

 		TSalaryDetailVo salaryDetailVo = new TSalaryDetailVo();