Commit Graph

1737 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 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
黎永顺 55d39d6523 feature/2.15.1.2407.01-社保档案保存校验 2024-08-19 16:37:46 +08:00
黎永顺 a3f40f506d hotfix/2.15.1.2407.01 2024-08-19 16:28:53 +08:00
黎永顺 dfcd27771f feature/2.15.1.2407.01-社保档案保存校验 2024-08-19 15:01:53 +08:00
黎永顺 d31ae5a030 feature/2.15.1.2407.01-导入工具 2024-08-19 10:43:30 +08:00
黎永顺 6a56cee090 feature/2.15.1.2407.01-导入工具 2024-08-19 10:42:54 +08:00
黎永顺 1d26ef8176 feature/2.15.1.2407.01-导入工具 2024-08-19 10:27:02 +08:00
黎永顺 f730cba8de feature/2.15.1.2407.01-导入工具 2024-08-16 16:37:45 +08:00
黎永顺 3d55619813 hotfix/2.15.1.2407.01 2024-08-15 17:43:03 +08:00
黎永顺 e8625fd0ef feature/2.15.1.2407.01-导入工具 2024-08-15 16:29:21 +08:00
黎永顺 ae665fb72d feature/2.15.1.2407.01-浮动薪酬 2024-08-15 16:01:00 +08:00
黎永顺 5009cd5955 hotfix/2.15.1.2407.01 2024-08-15 15:43:52 +08:00
黎永顺 4be61e9179 feature/2.15.1.2407.01-浮动薪酬 2024-08-15 15:24:00 +08:00
黎永顺 37f7a3bd6b Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 11:05:09 +08:00
黎永顺 5c9f954adb hotfix/2.15.1.2407.01 2024-08-15 11:04:14 +08:00
黎永顺 f984cd3f59 hotfix/2.15.1.2407.01 2024-08-15 11:01:26 +08:00
黎永顺 23e9a6ba42 hotfix/2.15.1.2407.01 2024-08-15 10:28:18 +08:00
黎永顺 bbc11b0609 feature/2.15.1.2407.01-浮动薪酬 2024-08-14 11:26:00 +08:00
黎永顺 54352aad95 feature/2.15.1.2407.01-浮动薪酬 2024-08-13 17:58:28 +08:00
黎永顺 44c63e874a Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-13 16:14:28 +08:00
黎永顺 d9fc164504 hotfix/2.15.1.2407.01 2024-08-13 16:12:43 +08:00
黎永顺 9479a4ba9a feature/2.15.1.2407.01-导入工具 2024-08-13 14:33:10 +08:00
黎永顺 a2c1fbd485 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-12 16:57:53 +08:00
黎永顺 74ba398c90 feature/2.15.1.2407.01-导入工具 2024-08-12 16:56:51 +08:00
黎永顺 f05c43d011 feature/2.15.1.2407.01-浮动薪酬 2024-08-12 14:58:36 +08:00
黎永顺 df2283d0f4 feature/2.15.1.2407.01-浮动薪酬 2024-08-12 11:12:10 +08:00
黎永顺 4a5f5b6e7a feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:56:58 +08:00
黎永顺 8c038c8d74 Merge branch 'hotfix/2.15.1.2407.01' into feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:27:43 +08:00