钱涛 ec27cf5a08 Merge branch 'release/2.13.1.2404.02' into release/个税版本 ... # Conflicts: # src/com/engine/salary/service/AddUpDeductionService.java # src/com/engine/salary/wrapper/AddUpDeductionWrapper.java		2024-05-08 11:17:40 +08:00
..
AddUpDeductionMapper.java	fix: 一键累计添加日期与校验	2022-11-09 16:55:00 +08:00
AddUpDeductionMapper.xml	fix: 一键累计添加日期与校验	2022-11-09 16:55:00 +08:00
AddUpDeductionRequestFailMapper.java	在线获取累计专项附加扣除	2023-09-04 14:20:42 +08:00
AddUpDeductionRequestFailMapper.xml	在线获取累计专项附加扣除	2023-09-04 14:20:42 +08:00
AddUpDeductionRequestMapper.java	在线获取累计专项附加扣除	2023-09-04 14:20:42 +08:00
AddUpDeductionRequestMapper.xml	在线获取累计专项附加扣除	2023-09-04 14:20:42 +08:00
AddUpSituationMapper.java	校验每次只能申报一个扣缴义务人	2023-03-07 17:44:21 +08:00
AddUpSituationMapper.xml	往期累计	2023-09-07 18:21:22 +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	优化公式不显示未启用的考勤字段	2024-03-14 16:08:16 +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	Merge branch 'release/2.13.1.2404.02' into release/个税版本	2024-05-08 11:17:40 +08:00
EmployMapper.xml	Merge branch 'release/2.13.1.2404.02' into release/个税版本	2024-05-08 11:17:40 +08:00
OtherDeductionMapper.java	其他免税扣除-新增、删除所选、一键清空功能	2022-10-27 18:02:05 +08:00
OtherDeductionMapper.xml	操作日志fix some bugs	2024-02-23 15:11:56 +08:00
SpecialAddDeductionMapper.java	日志	2024-02-21 18:19:02 +08:00
SpecialAddDeductionMapper.xml	操作日志fix some bugs	2024-02-23 15:11:56 +08:00