薪酬后端

钱涛 aec6918c12 Merge branch 'release/2.9.1.2307.01' into feature/外部人员 ... # Conflicts: # src/com/engine/salary/biz/EmployBiz.java # src/com/engine/salary/biz/SIAccountBiz.java # src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java # src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java # src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java # src/com/engine/salary/service/SalaryEmployeeService.java # src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java # src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java # src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java # src/com/engine/salary/service/impl/SIAccountServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java # src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java # src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java # src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java # src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java # src/com/engine/salary/web/SalarySobController.java # src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java # src/com/engine/salary/wrapper/SalaryArchiveWrapper.java # src/com/engine/salary/wrapper/SalarySendWrapper.java # src/com/engine/salary/wrapper/TaxAgentSubAdminWrapper.java # src/com/engine/salary/wrapper/TaxDeclarationWrapper.java		2023-07-11 16:08:15 +08:00
resource	Merge branch 'release/2.9.1.2307.01' into feature/外部人员	2023-07-11 16:08:15 +08:00
src/com	Merge branch 'release/2.9.1.2307.01' into feature/外部人员	2023-07-11 16:08:15 +08:00
.gitignore	福利台账导出及列表bug修复	2022-04-19 17:46:24 +08:00