钱涛 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
..
AddUpDeductionMapper.java	fix: 一键累计添加日期与校验	2022-11-09 16:55:00 +08:00
AddUpDeductionMapper.xml	fix: 一键累计添加日期与校验	2022-11-09 16:55:00 +08:00
AddUpSituationMapper.java	校验每次只能申报一个扣缴义务人	2023-03-07 17:44:21 +08:00
AddUpSituationMapper.xml	年终奖数据	2023-04-11 17:24:31 +08:00
AttendQuoteDataMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
AttendQuoteDataMapper.xml	考勤引用=编辑	2022-10-28 16:15:51 +08:00
AttendQuoteDataValueMapper.java	考勤引用=编辑	2022-10-28 16:15:51 +08:00
AttendQuoteDataValueMapper.xml	考勤引用=编辑	2022-10-28 16:15:51 +08:00
AttendQuoteFieldMapper.java	考勤导出接口	2022-03-16 14:29:02 +08:00
AttendQuoteFieldMapper.xml	薪酬系统-pg数据库适配，考勤引用-设置表头字段显示异常问题修复	2023-06-26 10:14:07 +08:00
AttendQuoteMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
AttendQuoteMapper.xml	考勤引用校验能够否删除	2023-06-16 11:49:23 +08:00
AttendQuoteSyncSetMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
AttendQuoteSyncSetMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00
EmployMapper.java	获取人员信息	2023-03-06 17:57:20 +08:00
EmployMapper.xml	Merge branch 'release/2.9.1.2307.01' into feature/外部人员	2023-07-11 16:08:15 +08:00
OtherDeductionMapper.java	其他免税扣除-新增、删除所选、一键清空功能	2022-10-27 18:02:05 +08:00
OtherDeductionMapper.xml	个人养老金	2023-04-04 14:21:25 +08:00
SpecialAddDeductionMapper.java	fix: 加解密处理	2022-11-09 14:32:00 +08:00
SpecialAddDeductionMapper.xml	fix: 加解密处理	2022-11-09 14:32:04 +08:00