Harryxzy 6e26dfa44a Merge branch 'release/2.17.1.2411.01' into custom/汇通建设集团 ... # Conflicts: # src/com/engine/salary/mapper/datacollection/EmployMapper.xml		2024-11-22 09:32:14 +08:00
..
agency	去除达梦驱动	2024-01-25 11:38:38 +08:00
config	薪酬迁移工具	2024-08-13 18:15:04 +08:00
datacollection	Merge branch 'release/2.17.1.2411.01' into custom/汇通建设集团	2024-11-22 09:32:14 +08:00
extemp	薪资明细表	2024-03-25 16:08:34 +08:00
hrm	核算时编辑人员组织信息	2024-07-25 14:04:14 +08:00
process/dto	调薪流程按钮	2022-08-24 20:00:57 +08:00
progress	公共进度条功能	2023-06-06 10:30:49 +08:00
report	去除达梦驱动	2024-01-25 11:38:38 +08:00
salaryBill	Merge branch 'feature/次账号' into release/2.17.1.2411.01	2024-11-12 18:05:42 +08:00
salaryacct	Merge branch 'release/2.17.1.2411.01' into custom/汇通建设集团	2024-11-22 09:32:14 +08:00
salaryarchive	Merge branch 'feature/次账号' into release/2.17.1.2411.01	2024-11-12 18:05:42 +08:00
salaryformula	Merge branch 'release/2.16.1.2410.01' into feature/次账号	2024-10-24 10:34:56 +08:00
salaryitem	Merge branch 'feature/工资单审批' into release/2.17.1.2411.01	2024-11-13 18:36:20 +08:00
salarysob	Merge branch 'feature/工资单审批' into release/2.17.1.2411.01	2024-11-13 18:36:20 +08:00
salarysql	线下对比	2022-04-26 16:39:41 +08:00
setting	fix默认值列表重复bug	2024-11-19 09:48:13 +08:00
siaccount	社保福利台账人员信息快照	2024-10-09 10:57:23 +08:00
siarchives	下载系统配置	2024-08-12 10:02:46 +08:00
sicategory	薪酬系统-福利方案，自定义福利列表返回结果优化	2024-02-20 16:59:18 +08:00
siexport	社保福利台账人员信息快照	2024-10-09 10:57:23 +08:00
sischeme	社保方案上下限	2024-08-19 12:07:03 +08:00
taxagent	扣缴义务人和账套的人员的人员状态	2024-11-01 10:04:15 +08:00
taxdeclaration	处理空指针	2024-03-07 14:12:16 +08:00
taxrate	oracle异常	2022-08-18 15:02:04 +08:00