Commit Graph

1762 Commits

Author SHA1 Message Date
lys 8c5b0acffa feature/2.16.1.2410.01-薪资核算单元格锁定 2024-10-18 11:51:06 +08:00
lys f407d8520d release/2.16.1.2410.01 2024-10-17 11:18:53 +08:00
lys 4b125994f7 release/2.16.1.2410.01 2024-10-17 11:17:55 +08:00
lys 1a0f594753 release/2.15.2.2409.01 2024-10-16 16:18:32 +08:00
lys 600bba8619 feature/2.15.2.2409.01 2024-10-16 15:23:21 +08:00
lys 0a447773b8 feature/2.15.2.2409.01 2024-10-16 14:42:57 +08:00
lys bee1d73eb7 release/2.15.2.2409.01 2024-10-15 16:33:26 +08:00
黎永顺 b954e1696e release/2.15.2.2409.01 2024-10-14 16:02:12 +08:00
黎永顺 7980acc6c2 release/2.15.2.2409.01 2024-10-14 14:20:02 +08:00
黎永顺 2b541a85df Merge branch 'feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列' into release/2.15.2.2409.01 2024-10-12 13:39:15 +08:00
黎永顺 5b3a645dfc release/2.15.2.2409.01 2024-10-12 10:07:36 +08:00
黎永顺 591f29d934 release/2.15.2.2409.01 2024-10-11 17:15:11 +08:00
黎永顺 0754316e77 feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列 2024-10-11 17:13:19 +08:00
黎永顺 90470c3a57 feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列 2024-10-11 17:06:54 +08:00
黎永顺 bdd4b4e446 release/2.15.2.2409.01 2024-10-10 15:32:41 +08:00
黎永顺 ca3c9079a1 release/2.15.2.2409.01 2024-10-10 13:57:09 +08:00
黎永顺 ab7d0c1f7f release/2.15.2.2409.01 2024-10-09 18:12:06 +08:00
黎永顺 01ef84368d Merge branch 'hotfix/2.15.1.2409.01' into release/2.15.2.2409.01 2024-10-09 14:55:29 +08:00
黎永顺 307f954eac feature/2.15.1.2407.01-权限 2024-10-09 14:55:11 +08:00
黎永顺 215094dac8 release/2.15.2.2409.01 2024-10-09 11:25:50 +08:00
黎永顺 bd93223774 hotfix/2.15.1.2409.01
规则设置添加薪资报表中的组织信息设置切换功能
2024-10-08 15:08:00 +08:00
黎永顺 53d45c2069 hotfix/2.15.1.2409.01
规则设置修改
2024-10-08 13:21:55 +08:00
黎永顺 9c318d22b7 hotfix/2.15.1.2409.01 2024-09-29 10:57:22 +08:00
黎永顺 f2b17872f7 release/2.15.2.2409.01 2024-09-25 11:12:53 +08:00
黎永顺 2664903959 release/2.15.2.2409.01 2024-09-23 16:25:46 +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
黎永顺 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