Commit Graph

12 Commits

Author SHA1 Message Date
黎永顺 550babca7b Merge branch 'release/2.15.1.2407.01' into release/2.15.1.2407.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2024-08-22 15:48:11 +08:00
黎永顺 d31ae5a030 feature/2.15.1.2407.01-导入工具 2024-08-19 10:43:30 +08:00
黎永顺 6a56cee090 feature/2.15.1.2407.01-导入工具 2024-08-19 10:42:54 +08:00
黎永顺 74ba398c90 feature/2.15.1.2407.01-导入工具 2024-08-12 16:56:51 +08:00
黎永顺 f3e1e1e166 Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税 2023-10-08 16:14:59 +08:00
黎永顺 ff3dd0ea60 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-25 15:35:11 +08:00
黎永顺 1bd7d92073 Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
#	pc4mobx/hrmSalary/components/importDialog/index.js
#	pc4mobx/hrmSalary/components/importDialog/index.less
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
2023-09-21 14:23:21 +08:00
黎永顺 8a90d58196 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-14 10:25:22 +08:00
黎永顺 f593e97207 feature社保福利档案添加非系统人员列表 2023-09-06 10:19:35 +08:00
黎永顺 bb1e328c92 feature社保福利档案添加非系统人员列表 2023-09-05 16:49:26 +08:00
黎永顺 2a40afb7b4 feature社保福利档案添加非系统人员列表 2023-09-05 15:14:05 +08:00
黎永顺 a2c2292e60 汉桑-社保福利台账添加福利导入的功能 2023-08-11 16:06:21 +08:00