 黎永顺
|
2f8d5cc74a
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
# Conflicts:
# pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiLeft.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.less
# pc4mobx/hrmSalary/index.js
|
2024-10-12 16:33:54 +08:00 |
|
黎永顺
|
9d06793a04
|
custom/领悦
|
2024-10-12 15:32:42 +08:00 |
|
黎永顺
|
48df3121fd
|
custom/领悦
|
2024-10-12 15:31:39 +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 |
|
黎永顺
|
925394e814
|
custom/领悦
|
2024-10-12 13:38:20 +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 |
|
黎永顺
|
44fb334837
|
custom/领悦
|
2024-10-10 16:29:36 +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 |
|
黎永顺
|
32940c9bcf
|
feature/2.15.1.2407.01-权
|
2024-09-25 10:46:55 +08:00 |
|
黎永顺
|
2664903959
|
release/2.15.2.2409.01
|
2024-09-23 16:25:46 +08:00 |
|
黎永顺
|
7821a990e9
|
custom/领悦
|
2024-09-23 16:18:58 +08:00 |
|
黎永顺
|
1ea3529b5a
|
custom/领悦
|
2024-09-14 13:56:02 +08:00 |
|
黎永顺
|
50a73b29eb
|
feature/2.15.1.2407.01-权限
|
2024-09-14 13:31:45 +08:00 |
|
黎永顺
|
1dca1d7268
|
feature/2.15.1.2407.01-权限
|
2024-09-14 13:31:12 +08:00 |
|
黎永顺
|
5de04424d2
|
feature/2.15.1.2407.01-权限
|
2024-09-14 13:18:18 +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 |
|
黎永顺
|
3bbe58562c
|
custom/领悦
|
2024-09-14 10:42:45 +08:00 |
|
黎永顺
|
658f4fa64f
|
custom/领悦
|
2024-09-14 09:55:54 +08:00 |
|
黎永顺
|
3f65ce2e1c
|
custom/领悦
|
2024-09-13 17:35:14 +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 |
|
黎永顺
|
f6e9153e3a
|
custom/领悦
|
2024-09-13 15:22:16 +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 |
|
黎永顺
|
2be7896e4e
|
custom/领悦
|
2024-09-06 14:16:34 +08:00 |
|
黎永顺
|
5a494893c7
|
custom/领悦
|
2024-09-06 13:18:52 +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 |
|
黎永顺
|
2064cc4111
|
custom/领悦
|
2024-09-05 10:07:22 +08:00 |
|
黎永顺
|
64c56fc280
|
custom/领悦
|
2024-09-03 16:19:42 +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 |
|
黎永顺
|
4385b8c6b2
|
custom/领悦
|
2024-09-02 14:00:22 +08:00 |
|
黎永顺
|
f843a8cc32
|
custom/领悦
|
2024-08-30 14:22:23 +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 |