Commit 73c2aa29 authored by hongguangwu's avatar hongguangwu

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

parents 3806b041 29855a67
...@@ -1878,7 +1878,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1878,7 +1878,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
salary.setOwnMoney(ownMoney); salary.setOwnMoney(ownMoney);
for (TSalaryAccount account : aList) { for (TSalaryAccount account : aList) {
relaySalarySum = relaySalarySum.add(account.getRelaySalaryUnit()); relaySalarySum = relaySalarySum.add(account.getRelaySalary());
} }
TSalaryDetailVo salaryDetailVo = new TSalaryDetailVo(); TSalaryDetailVo salaryDetailVo = new TSalaryDetailVo();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment