Commit Graph

2121 Commits

Author SHA1 Message Date
黎永顺 b14c2f9f87 feature/2.9.42310.02-社保福利档案页面重构 2023-11-30 15:13:09 +08:00
黎永顺 f113cb437f feature/2.9.42310.02-社保福利档案页面重构 2023-11-30 14:52:14 +08:00
黎永顺 36eb6eae6a feature/2.9.9.2312.01-接口复写合并 2023-11-30 14:04:57 +08:00
黎永顺 39650fa172 Merge branch 'feature/2.9.42310.01-接口fetch重新封装' into feature/2.9.9.2312.01-接口复写合并
# Conflicts:
#	pc4mobx/hrmSalary/apis/archive.js
2023-11-30 13:55:38 +08:00
黎永顺 2196dde486 Merge branch 'master' into hotfix/2.9.9.2312.01 2023-11-30 09:22:40 +08:00
黎永顺 4f23b8db3c hotfix/2.9.9.2312.01 2023-11-30 09:22:35 +08:00
黎永顺 9949df47fb feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-30 09:10:59 +08:00
黎永顺 84d4df6d3d feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-29 18:29:55 +08:00
黎永顺 79fca386d3 feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-29 14:02:53 +08:00
黎永顺 3da1d6964b 1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-28 15:24:48 +08:00
黎永顺 7d1b3f840f Merge branch 'release/2.9.42311.02' 2023-11-28 13:53:37 +08:00
黎永顺 7cc9e422b1 1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化 2023-11-28 13:44:53 +08:00
黎永顺 23f15bd423 feature/2.9.42311.02-社保核算以及薪资账套查询优化 2023-11-27 19:17:44 +08:00
黎永顺 e01b5bf1c9 feature/2.9.42310.02-社保福利档案页面重构 2023-11-27 17:52:17 +08:00
黎永顺 5e60775029 feature/2.9.42310.02-社保福利档案页面重构 2023-11-27 17:45:11 +08:00
黎永顺 2c7633b0c9 feature/2.9.42310.02-社保福利档案页面重构 2023-11-27 15:29:07 +08:00
黎永顺 7579a8cd31 feature/2.9.42310.02-社保福利档案页面重构 2023-11-24 14:45:37 +08:00
黎永顺 24cf38e964 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02 2023-11-24 14:06:48 +08:00
黎永顺 bbb9bce35a feature/2.9.42310.01-工资单发放页面重构 2023-11-24 13:55:58 +08:00
黎永顺 c2f4c4372c feature/2.9.42310.02-社保福利档案页面重构 2023-11-24 11:43:03 +08:00
黎永顺 6f9f24f7a8 feature/2.9.42310.01-工资单发放页面重构-添加短信设置的发送设置 2023-11-23 15:50:21 +08:00
黎永顺 94b3f056f4 hotfix/2.9.42311.02-我的薪资福利页面重构 2023-11-20 17:48:44 +08:00
黎永顺 373b0aad56 hotfix/2.9.42311.02 2023-11-17 13:33:56 +08:00
黎永顺 f4574570d9 hotfix/2.9.42311.02 2023-11-15 13:53:56 +08:00
黎永顺 f0b657f26e Merge branch 'release/2.9.42311.02' into hotfix/2.9.42311.02 2023-11-15 13:32:40 +08:00
黎永顺 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