Commit Graph

1796 Commits

Author SHA1 Message Date
黎永顺 7dfd328aae hotfix/2.9.42311.02 2023-11-14 14:45:13 +08:00
黎永顺 ff870c110c hotfix/2.9.42311.02-薪资核算名称修改 2023-11-13 16:51:40 +08:00
黎永顺 f51de57661 feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 15:49:45 +08:00
黎永顺 1d110fe25d feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 15:35:43 +08:00
黎永顺 115a0ee64f Merge branch 'hotfix/2.9.42311.02' 2023-11-13 14:18:16 +08:00
黎永顺 0798d2bf96 hotfix/2.9.42311.02 2023-11-13 14:15:49 +08:00
黎永顺 3ab54027f9 feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 14:13:03 +08:00
黎永顺 9f114e9867 hotfix/2.9.42311.02 2023-11-13 11:17:38 +08:00
黎永顺 28c50dc563 hotfix/2.9.42311.02 2023-11-13 11:03:19 +08:00
黎永顺 0a1173faaa feature/2.9.42311.02-我的薪资福利移动端列表查看 2023-11-13 10:41:47 +08:00
黎永顺 d46f40b086 feature/2.9.42310.02-社保福利档案页面重构 2023-11-10 13:34:36 +08:00
黎永顺 436db457db feature/2.9.42310.02-社保福利档案页面重构 2023-11-09 17:51:38 +08:00
黎永顺 7908f925ea release/2.9.42311.01 2023-11-09 16:27:33 +08:00
黎永顺 1afaa04129 1release/2.9.42311.01 2023-11-09 15:36:13 +08:00
黎永顺 f0f4bfb877 feature/2.9.42310.02-社保福利档案页面重构 2023-11-09 13:54:34 +08:00
黎永顺 aa1cef89b2 feature/2.9.42310.02-社保福利档案页面重构 2023-11-09 13:52:54 +08:00
黎永顺 8252cebd98 1release/2.9.42311.01 2023-11-08 18:11:38 +08:00
黎永顺 84a908e94e feature/2.9.42310.02-社保福利档案页面重构 2023-11-08 16:14:10 +08:00
黎永顺 1eac37cd38 feature/2.9.42310.02-社保福利档案页面重构 2023-11-08 13:37:33 +08:00
黎永顺 a075c4a479 Merge branch 'feature/2.9.42310.01-社保档案操作日志' into release/2.9.42311.01 2023-11-07 19:16:27 +08:00
黎永顺 147d0908f1 Merge branch 'feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置' into release/2.9.42311.01
# Conflicts:
#	pc4mobx/hrmSalary/apis/statistics.js
2023-11-07 19:16:10 +08:00
黎永顺 8162e02796 feature/2.9.42310.02-社保福利档案页面重构 2023-11-07 19:13:38 +08:00
黎永顺 675d583557 feature/2.9.42310.02-社保福利档案页面重构 2023-11-07 16:57:47 +08:00
黎永顺 d9a7814080 feature/2.9.42310.01-接口fetch重新封装 2023-11-07 16:43:23 +08:00
黎永顺 5fd2120f14 feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置 2023-11-07 16:21:17 +08:00
黎永顺 858b694568 feature/2.9.42310.01-接口fetch重新封装 2023-11-07 11:26:08 +08:00
黎永顺 4c7b3f9a6a feature/2.9.42310.02-社保福利档案页面重构 2023-11-07 10:28:44 +08:00
黎永顺 8bd1cd51af feature/2.9.42310.02-薪酬统计报表统计项目设置 2023-11-06 17:05:26 +08:00
黎永顺 eefa47164a feature/2.9.42310.02-社保福利档案页面重构 2023-11-06 16:09:23 +08:00
黎永顺 560af8a703 feature/2.9.42310.01-接口fetch重新封装 2023-11-06 09:24:47 +08:00
黎永顺 68bd42c2c0 feature/2.9.42310.02-社保福利档案页面重构 2023-11-03 09:54:02 +08:00
黎永顺 b0500cf8f9 feature/2.9.42310.02-社保福利档案页面重构 2023-11-02 18:17:30 +08:00
黎永顺 a617c40c1f feature/2.9.42310.02-社保福利档案页面重构 2023-11-02 16:33:16 +08:00
黎永顺 f9f47324e5 feature/2.9.42310.02-薪酬统计报表统计项目设置 2023-11-02 14:30:18 +08:00
黎永顺 8a3a1dcf76 feature/2.9.42310.02-社保福利档案页面重构 2023-11-02 09:18:16 +08:00
黎永顺 121d82d379 feature/2.9.42310.02-社保福利档案页面重构 2023-11-01 16:18:51 +08:00
黎永顺 b2dda3a728 feature/2.9.42310.02-社保福利档案页面重构 2023-11-01 09:10:28 +08:00
黎永顺 c068959e73 feature/2.9.42310.02-社保福利档案页面重构 2023-10-31 16:59:50 +08:00
黎永顺 a21982bf62 hotfix/2.9.42310.02 2023-10-31 15:50:52 +08:00
黎永顺 6aed11a411 hotfix/2.9.42310.02 2023-10-31 15:45:15 +08:00
黎永顺 b14fce7949 feature/2.9.42310.02-社保福利档案页面重构 2023-10-31 15:30:21 +08:00
黎永顺 cd9964a329 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-31 09:44:59 +08:00
黎永顺 e246e10af7 hotfix/2.9.42310.02 2023-10-30 15:54:25 +08:00
黎永顺 4acdff060c hotfix/2.9.42310.02 2023-10-30 08:55:15 +08:00
黎永顺 015e29ac47 Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into develop 2023-10-27 17:28:21 +08:00
黎永顺 c44f92fb56 Merge branch 'hotfix/2.9.42310.02' into develop 2023-10-27 17:28:11 +08:00
黎永顺 32e01016c1 hotfix/2.9.42310.02 2023-10-27 16:27:01 +08:00
黎永顺 eed8d3a5bd feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 16:14:59 +08:00
黎永顺 235e7cc6f0 feature/2.9.42310.01-薪资项目拓扑图 2023-10-27 10:43:23 +08:00
黎永顺 7d09c5b55b hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
2023-10-25 15:45:38 +08:00