Commit Graph

1770 Commits

Author SHA1 Message Date
黎永顺 02b085c051 权限 2024-09-20 16:30:12 +08:00
黎永顺 e9abaa26bb 权限 2024-09-19 10:36:04 +08:00
黎永顺 f1f4258090 feature/2.15.1.2407.01-权限 2024-09-14 18:01:11 +08:00
黎永顺 4999cc12bf Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限 2024-09-14 15:55:46 +08:00
黎永顺 15cc213c8c custom/大成 2024-09-14 15:52:12 +08:00
黎永顺 b597bdd2bb feature/2.15.1.2407.01-权限 2024-09-14 14:28:58 +08:00
黎永顺 6928f89df6 feature/2.15.1.2407.01-权限 2024-09-14 11:41:31 +08:00
黎永顺 1c1aac66d7 hotfix/2.15.1.2409.01
浮动薪酬模块页面样式调整
2024-09-14 11:15:25 +08:00
黎永顺 c738ba0c6f Merge branch 'release/2.15.2.2409.01' into hotfix/2.15.1.2409.01 2024-09-14 10:43:55 +08:00
黎永顺 7ac7a58f7e Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限 2024-09-13 17:35:58 +08:00
黎永顺 f780662b1b hotfix/2.15.1.2407.01 2024-09-13 15:52:15 +08:00
黎永顺 99ebca78d0 hotfix/2.15.1.2407.01 2024-09-13 15:45:43 +08:00
黎永顺 d7b1c173c2 feature/2.15.1.2407.01-权限 2024-09-13 14:11:26 +08:00
黎永顺 687371ab39 Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into release/2.15.2.2409.01
# Conflicts:
#	pc4mobx/hrmSalary/index.js
2024-09-13 11:18:48 +08:00
黎永顺 3f0502aabf feature/2.15.1.2407.01-权限 2024-09-13 11:12:53 +08:00
黎永顺 85cdbbe8b2 custom/大成 2024-09-12 17:50:19 +08:00
黎永顺 4a386102ef feature/2.15.1.2407.01-权限 2024-09-12 16:34:39 +08:00
黎永顺 3c33fc7a3a feature/2.15.1.2407.01-权限 2024-09-12 13:53:47 +08:00
黎永顺 394d7152f4 feature/2.15.1.2407.01-权限 2024-09-12 13:13:51 +08:00
黎永顺 b99a2069d4 feature/2.15.1.2407.01-权限 2024-09-11 18:37:01 +08:00
黎永顺 6586f68d58 Merge branch 'release/2.15.1.2407.01' into feature/2.15.1.2407.01-权限 2024-09-10 16:34:12 +08:00
黎永顺 c07a43b8f8 feature/2.15.1.2407.01-权限 2024-09-10 16:33:21 +08:00
黎永顺 66f6cbc403 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-09-10 12:54:45 +08:00
黎永顺 3fae1f1a9d hotfix/2.15.1.2407.01 2024-09-10 12:52:25 +08:00
黎永顺 e8d0006cbb feature/2.15.1.2407.01-权限 2024-09-10 12:50:40 +08:00
黎永顺 9759a529f5 feature/2.15.1.2407.01-权限 2024-09-10 12:23:18 +08:00
黎永顺 34bf2c8c52 feature/2.15.1.2407.01-权限 2024-09-09 09:35:02 +08:00
黎永顺 a56ee784db feature/2.15.1.2407.01-权限 2024-09-06 15:45:57 +08:00
黎永顺 a729826c8d feature/2.15.1.2407.01-权限 2024-09-06 14:15:39 +08:00
黎永顺 6e3d716afd feature/2.15.1.2407.01-权限 2024-09-06 13:30:09 +08:00
黎永顺 4976f29240 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-09-05 10:13:37 +08:00
黎永顺 76da4dd1e1 hotfix/2.15.1.2407.01 2024-09-05 10:13:03 +08:00
黎永顺 724c4bb53b feature/2.15.1.2407.01-权限 2024-09-03 16:34:22 +08:00
黎永顺 841be03462 Merge branch 'feature/2.15.1.2407.01-社保档案保存校验' into release/2.15.1.2407.01 2024-09-03 09:24:02 +08:00
黎永顺 5717c1e635 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-30 13:42:43 +08:00
黎永顺 bf197d455e hotfix/2.15.1.2407.01
薪酬统计报表数据穿透接口参数修改
2024-08-30 13:42:21 +08:00
黎永顺 1fb7b07b22 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-29 15:28:23 +08:00
黎永顺 21ead59420 hotfix/2.15.1.2407.01 2024-08-29 15:21:37 +08:00
黎永顺 9f2f7f0678 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-29 09:46:07 +08:00
黎永顺 4810a09f29 hotfix/2.15.1.2407.01 2024-08-28 14:57:34 +08:00
黎永顺 69fd955592 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-22 15:44:34 +08:00
黎永顺 b91f35418e feature/2.15.1.2407.01-权限 2024-08-22 15:42:35 +08:00
黎永顺 b0d790f988 feature/2.15.1.2407.01-权限 2024-08-21 16:00:28 +08:00
黎永顺 cc81d8c9bd feature/2.15.1.2407.01-权限 2024-08-20 18:07:03 +08:00
黎永顺 b7c5ae22f3 feature/2.15.1.2407.01-权限 2024-08-20 16:48:02 +08:00
黎永顺 421fca99cc Merge branch 'feature/2.15.1.2407.01-导入工具' into release/2.15.1.2407.01 2024-08-20 13:37:39 +08:00
黎永顺 c0b517201f feature/2.15.1.2407.01-社保档案保存校验 2024-08-20 10:07:29 +08:00
黎永顺 63eb373025 hotfix/2.15.1.2407.01 2024-08-20 09:23:41 +08:00
黎永顺 96f6135aba hotfix/2.15.1.2407.01 2024-08-19 17:32:49 +08:00
黎永顺 b7e29df781 feature/2.15.1.2407.01-导入工具 2024-08-19 16:39:14 +08:00