Commit Graph

16 Commits

Author SHA1 Message Date
黎永顺 4c8c3e7251 Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/apis/index.js
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
#	pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
#	pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
#	pc4mobx/hrmSalary/pages/declare/declare.js
2024-03-06 14:42:29 +08:00
黎永顺 7078b1c6c4 feature/2.10.1.2401.01-页面操作日志添加 2024-02-23 10:13:43 +08:00
黎永顺 ce1acae344 Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税 2023-12-05 17:16:37 +08:00
黎永顺 7cc9e422b1 1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-28 13:44:53 +08:00
黎永顺 4ffd2731ee Merge branch 'hotfix/2.9.42311.02' into release/2.9.42311.02-个税 2023-11-17 13:47:56 +08:00
黎永顺 7dfd328aae hotfix/2.9.42311.02 2023-11-14 14:45:13 +08:00
黎永顺 5a151f3910 hotfix/2.9.42309.01-个税 2023-09-22 11:14:48 +08:00
黎永顺 a4eab6fa47 个税-在线申报bug修改 2023-08-25 17:49:43 +08:00
黎永顺 3d04a79fcd 产品-统一页面列表操作按钮 2023-07-03 15:42:11 +08:00
黎永顺 8fd6579dfd 薪资账套报错bug 2023-01-13 17:30:24 +08:00
黎永顺 c6d6693198 薪资账套页面重构 2022-12-09 14:16:11 +08:00
黎永顺 1d64220c7c 薪资账套重构 2022-12-08 16:58:32 +08:00
黎永顺 645ec864f3 薪资账套重构 2022-12-08 16:43:55 +08:00
黎永顺 7baf97e20f 薪资账套重构 2022-12-08 15:48:46 +08:00
黎永顺 53d418fe78 薪资账套页面重构 2022-12-07 17:06:00 +08:00
黎永顺 b12d3862a0 薪资账套页面页面重构 2022-12-07 14:40:07 +08:00