 lys
|
83e17988e2
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into custom/汇通建设(备份251216)
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/calculate.js
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
# pc4mobx/hrmSalary/pages/payrollRelease/components/grantTableList/index.js
# pc4mobx/hrmSalary/pages/payrollRelease/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordList.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
|
2025-12-16 10:39:45 +08:00 |
|
lys
|
abaa329845
|
Merge branch 'release/2.19.1.2501.01' into custom/汇通建设
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
|
2025-12-02 10:33:15 +08:00 |
|
lys
|
5e5e109b7e
|
release/2.19.1.2501.01
|
2025-11-13 16:42:10 +08:00 |
|
lys
|
372d9d53ee
|
release/3.0.1.2504.01-合并业务线
|
2025-11-13 16:40:45 +08:00 |
|
lys
|
9efeb109e9
|
release/3.0.1.2504.01-合并业务线
|
2025-10-30 10:17:27 +08:00 |
|
lys
|
c00d3f446d
|
release/3.0.1.2504.01-合并业务线
|
2025-10-28 15:09:36 +08:00 |
|
lys
|
92c966310c
|
feature/3.0.1.2504.01-下拉框多选支持搜索
|
2025-10-27 14:55:34 +08:00 |
|
lys
|
27f9da9aa9
|
release/3.0.1.2504.01-合并业务线
|
2025-10-14 15:54:00 +08:00 |
|
lys
|
7f4e47b5bd
|
release/3.0.1.2504.01-合并业务线
|
2025-10-13 17:11:10 +08:00 |
|
lys
|
b0d60afc11
|
release/3.0.1.2504.01-合并业务线
|
2025-10-13 16:14:09 +08:00 |
|
lys
|
40d84b30fd
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-10-10 11:05:48 +08:00 |
|
lys
|
efb5af1b10
|
release/2.19.1.2501.01
|
2025-10-10 11:05:18 +08:00 |
|
lys
|
61ff174303
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-09-12 09:58:22 +08:00 |
|
lys
|
915e946c3e
|
release/2.19.1.2501.01
|
2025-09-12 09:57:54 +08:00 |
|
lys
|
ff1da8b19b
|
release/2.19.1.2501.01
|
2025-09-04 09:59:22 +08:00 |
|
lys
|
9cda9aa414
|
release/3.0.1.2504.01-合并业务线
|
2025-09-04 09:58:43 +08:00 |
|
lys
|
000e8acdaf
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-09-02 15:04:34 +08:00 |
|
lys
|
5ef2c5ecb4
|
release/2.19.1.2501.01
|
2025-09-02 14:52:58 +08:00 |
|
lys
|
5da8661bbd
|
0release/3.0.1.2504.01-合并业务线
|
2025-08-26 14:25:26 +08:00 |
|
lys
|
5f80e9e6b3
|
release/2.19.1.2501.01
|
2025-08-04 16:29:06 +08:00 |
|
lys
|
2b39980ed0
|
release/2.19.1.2501.01
|
2025-08-04 16:24:41 +08:00 |
|
lys
|
2321266533
|
release/2.19.1.2501.01
|
2025-08-04 16:23:10 +08:00 |
|
lys
|
32162c9cba
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-07-24 16:54:25 +08:00 |
|
lys
|
3d8b242889
|
release/2.19.1.2501.01
|
2025-07-24 16:51:19 +08:00 |
|
lys
|
9121309221
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-07-24 16:45:23 +08:00 |
|
lys
|
2871043810
|
release/2.19.1.2501.01
|
2025-07-17 17:28:48 +08:00 |
|
lys
|
fe19fe8ea2
|
custom/汇通建设
|
2025-07-16 14:19:56 +08:00 |
|
lys
|
95c72c9a1d
|
custom/汇通建设
|
2025-07-15 16:21:45 +08:00 |
|
lys
|
bd3741b2cf
|
Merge branch 'release/2.19.1.2501.01' into custom/汇通建设
|
2025-07-14 09:42:07 +08:00 |
|
lys
|
f3e2d878d0
|
release/3.0.1.2504.01-合并业务线
|
2025-07-08 10:18:34 +08:00 |
|
lys
|
8eadce0ce3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-06-19 14:03:55 +08:00 |
|
lys
|
0ec1cd1cb1
|
release/2.19.1.2501.01
|
2025-06-19 13:43:35 +08:00 |
|
lys
|
2b8892f798
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-06-18 15:43:13 +08:00 |
|
lys
|
c356c4f0db
|
release/2.19.1.2501.01
|
2025-06-18 09:29:55 +08:00 |
|
lys
|
b0e7cbfc41
|
release/3.0.1.2504.01-合并业务线
|
2025-06-12 10:37:23 +08:00 |
|
lys
|
dc80b9c0b7
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-06-12 09:30:02 +08:00 |
|
lys
|
b17251e8f0
|
Merge branch 'feature/2.19.1.2501.01-薪酬批量操作' into custom/汇通建设
|
2025-06-10 16:53:38 +08:00 |
|
lys
|
e9597b5332
|
feature/2.19.1.2501.01-薪酬批量操作
|
2025-06-10 16:11:03 +08:00 |
|
lys
|
2f649ecae6
|
feature/2.19.1.2501.01-薪酬批量操作
|
2025-06-10 10:00:37 +08:00 |
|
lys
|
c4963d138c
|
feature/2.19.1.2501.01-薪酬批量操作
|
2025-06-04 15:34:58 +08:00 |
|
lys
|
004deaeea3
|
feature/2.19.1.2501.01-薪酬批量操作
|
2025-06-04 13:47:12 +08:00 |
|
lys
|
b9efc6386e
|
feature/2.19.1.2501.01-薪酬批量操作
|
2025-06-03 17:22:18 +08:00 |
|
lys
|
b4f2ff8060
|
custom/汇通建设
|
2025-06-03 10:04:35 +08:00 |
|
lys
|
2b639ad388
|
custom/五院杭州中心
|
2025-05-27 12:31:43 +08:00 |
|
lys
|
693c436d4a
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-05-20 16:50:29 +08:00 |
|
lys
|
07c40750da
|
release/2.19.1.2501.01
|
2025-05-19 16:04:11 +08:00 |
|
lys
|
a4c08b937b
|
release/2.19.1.2501.01
|
2025-05-13 13:53:35 +08:00 |
|
lys
|
9e26192aa2
|
release/2.19.1.2501.01
|
2025-05-09 19:14:38 +08:00 |
|
lys
|
2e832e3aa9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-30 10:24:00 +08:00 |
|
lys
|
d540698c57
|
release/2.19.1.2501.01
|
2025-04-30 10:23:36 +08:00 |