钱涛 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
..
SalaryArchiveDimissionMapper.java	薪资档案	2022-03-28 20:04:27 +08:00
SalaryArchiveDimissionMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00
SalaryArchiveItemMapper.java	薪资档案加密设置	2022-10-10 09:43:57 +08:00
SalaryArchiveItemMapper.xml	外部人员终极版	2023-03-15 22:48:01 +08:00
SalaryArchiveMapper.java	Merge branch 'release/2.9.1.2307.01' into feature/外部人员	2023-07-11 16:08:15 +08:00
SalaryArchiveMapper.xml	Merge branch 'release/2.9.1.2307.01' into feature/外部人员	2023-07-11 16:08:15 +08:00
SalaryArchiveTaxAgentMapper.java	支持人员可在多个扣缴单位	2022-07-14 10:36:51 +08:00
SalaryArchiveTaxAgentMapper.xml	'xzy-解决oracle批量添加问题'	2022-08-17 13:28:33 +08:00