薪酬后端

钱涛 1473f72bd0 Merge branch 'release/2.15.1.2407.01' into release/个税版本 ... # Conflicts: # src/com/engine/salary/mapper/datacollection/EmployMapper.java # src/com/engine/salary/mapper/datacollection/EmployMapper.xml # src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java # src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml # src/com/engine/salary/service/SalaryAcctEmployeeService.java # src/com/engine/salary/service/SalaryEmployeeService.java # src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java # src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java		2024-07-31 13:27:15 +08:00
resource	去除累计应扣缴税额	2024-07-23 14:57:35 +08:00
src/com	Merge branch 'release/2.15.1.2407.01' into release/个税版本	2024-07-31 13:27:15 +08:00
test	恢复对比功能	2024-07-23 10:14:58 +08:00
.gitignore	福利台账导出及列表bug修复	2022-04-19 17:46:24 +08:00