 lys
|
bdfc9513c8
|
release/3.0.0.2502.01-合并业务线
|
2025-02-27 18:25:52 +08:00 |
|
lys
|
4473d8dad5
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-19 09:56:29 +08:00 |
|
lys
|
368542a52b
|
Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.less
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
|
2024-10-25 09:43:15 +08:00 |
|
lys
|
0a447773b8
|
feature/2.15.2.2409.01
|
2024-10-16 14:42:57 +08:00 |
|
lys
|
73de6b8417
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/searchPannel/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.less
|
2024-10-16 11:11:23 +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 |
|
黎永顺
|
215094dac8
|
release/2.15.2.2409.01
|
2024-10-09 11:25:50 +08:00 |
|
黎永顺
|
198668654a
|
feature/2.15.1.2407.01-权限
|
2024-09-27 18:38:37 +08:00 |
|
黎永顺
|
0683625850
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.js
|
2024-09-27 18:35:25 +08:00 |
|
黎永顺
|
d4763dc2d2
|
feature/2.15.1.2407.01-权限
|
2024-09-27 18:30:31 +08:00 |
|
黎永顺
|
6c99d5fbad
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限
|
2024-09-27 16:21:35 +08:00 |
|
黎永顺
|
8996fa8d79
|
feature/2.15.1.2407.01-权限
|
2024-09-27 16:20:28 +08:00 |
|
黎永顺
|
02b085c051
|
权限
|
2024-09-20 16:30:12 +08:00 |
|
黎永顺
|
f1f4258090
|
feature/2.15.1.2407.01-权限
|
2024-09-14 18:01:11 +08:00 |
|
黎永顺
|
1c1aac66d7
|
hotfix/2.15.1.2409.01
浮动薪酬模块页面样式调整
|
2024-09-14 11:15:25 +08:00 |
|
黎永顺
|
ae665fb72d
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-15 16:01:00 +08:00 |
|
黎永顺
|
4be61e9179
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-15 15:24:00 +08:00 |
|
黎永顺
|
54352aad95
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-13 17:58:28 +08:00 |
|
黎永顺
|
f05c43d011
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 14:58:36 +08:00 |
|
黎永顺
|
4a5f5b6e7a
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:56:58 +08:00 |
|
黎永顺
|
9d99557f4b
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:24:11 +08:00 |
|
黎永顺
|
86de787ed4
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 18:24:45 +08:00 |
|
黎永顺
|
70fe54efb7
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 17:32:54 +08:00 |
|
黎永顺
|
36d90b35a6
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 14:36:11 +08:00 |