sy efadc32622 Merge remote-tracking branch 'remotes/origin/release/2.9.8.2311.02' into feature/salary_i18 ... # Conflicts: # src/com/engine/salary/biz/AddUpDeductionBiz.java # src/com/engine/salary/biz/AddUpSituationBiz.java # src/com/engine/salary/biz/OtherDeductionBiz.java # src/com/engine/salary/biz/SalaryArchiveItemBiz.java # src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java # src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java # src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java # src/com/engine/salary/report/enums/UnitTypeEnum.java # src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java # src/com/engine/salary/service/impl/SISchemeServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java # src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java # src/com/engine/salary/service/impl/SalaryBillServiceImpl.java # src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java # src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java # src/com/engine/salary/util/excel/ExcelUtilPlus.java # src/com/engine/salary/web/SIArchivesController.java # src/com/engine/salary/web/SISchemeController.java # src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java # src/com/engine/salary/wrapper/SalaryTemplateWrapper.java		2023-11-30 16:48:22 +08:00
..
archive	Merge remote-tracking branch 'remotes/origin/release/2.9.8.2311.02' into feature/salary_i18	2023-11-30 16:48:22 +08:00
datacollection	薪酬系统-非系统人员管理，导入时增加对多级部门的识别	2023-09-07 15:11:10 +08:00
extemp	薪酬系统-福利档案，非系统人员tab页列表	2023-09-06 10:04:58 +08:00
formula	公式删除校验	2023-02-23 15:48:18 +08:00
hrm	修改关键字	2023-11-07 11:00:00 +08:00
report	报表日期	2023-11-09 16:14:35 +08:00
salaryacct	薪资核算结果导入超过1000报错	2023-11-20 10:56:03 +08:00
salarybill	短信模板	2023-11-16 11:38:21 +08:00
salaryitem	薪酬系统-多语言，薪资项目、薪资项目分组更改名称获取逻辑（适配多语言）	2023-11-14 13:49:10 +08:00
salarysob	薪酬系统-多语言，薪资项目、薪资项目分组更改名称获取逻辑（适配多语言）	2023-11-14 13:49:10 +08:00
siaccount	Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into feature/230901-福利台账-调差，支持一个人存在多个调差记录	2023-09-08 16:57:32 +08:00
siarchives	薪酬系统-福利档案，福利档案基数调整记录列表功能优化，可展示非系统人员姓名	2023-10-25 19:14:02 +08:00
sicategory	薪酬系统-多语言，薪资项目、薪资项目分组更改名称获取逻辑（适配多语言）	2023-11-14 13:49:10 +08:00
sischeme	薪酬系统-福利方案，福利方案修改action	2023-09-19 15:24:44 +08:00
sys	工资单确认反馈	2023-07-12 15:17:59 +08:00
taxagent	fix个税扣缴义务人删除人员范围，档案不跳到停薪	2023-08-02 14:47:40 +08:00
taxdeclaration	撤回个税申报	2023-06-12 10:40:01 +08:00
InsuranceExportMapper.java	薪酬系统-福利档案，非系统人员tab页列表	2023-09-06 10:04:58 +08:00
InsuranceExportMapper.xml	薪酬系统-福利档案，非系统人员tab页列表	2023-09-06 10:04:58 +08:00
SysTaxRateBaseMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
SysTaxRateBaseMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00
SysTaxRateDetailMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
SysTaxRateDetailMapper.xml	核算基础公式	2022-04-11 20:17:47 +08:00
TaxRateBaseMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
TaxRateBaseMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00
TaxRateDetailMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
TaxRateDetailMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00