Commit Graph

11 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
黎永顺 a6f382a36b feature/2.10.1.2401.01-页面操作日志添加 2024-01-31 10:24:15 +08:00
黎永顺 62704f5825 Merge branch 'release/2.9.42311.01' into release/2.9.42310.01-个税
# Conflicts:
#	pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
2023-11-09 10:26:44 +08:00
黎永顺 5fd2120f14 feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置 2023-11-07 16:21:17 +08:00
黎永顺 3645c52434 产品-智能算薪 2023-08-09 10:35:49 +08:00
黎永顺 7c60a44e66 产品-薪酬统计分析模块 2023-04-20 15:36:51 +08:00
黎永顺 d09562355c 产品-薪酬统计分析管理 2023-04-19 09:29:38 +08:00
黎永顺 a793cda867 产品-薪酬统计分析管理 2023-04-18 17:19:15 +08:00
黎永顺 4929ff4db5 产品-薪酬统计分析 2023-04-17 17:32:16 +08:00
黎永顺 8fe5f201c6 薪酬統計 2023-04-12 10:47:51 +08:00
黎永顺 dfae2661a6 产品功能-薪酬统计分析 2023-04-11 13:41:56 +08:00