 lys
|
5c6ecef51a
|
feature/3.0.0.2502.01-合并业务线-社保福利台账增减人员
|
2025-03-06 16:13:49 +08:00 |
|
lys
|
7656d78fa0
|
feature/3.0.0.2502.01-合并业务线-社保福利台账增减人员
|
2025-03-06 15:43:43 +08:00 |
|
lys
|
c231ad078d
|
custom/领悦业务线
|
2025-03-05 17:40:36 +08:00 |
|
lys
|
ce26eadb13
|
custom/领悦业务线
|
2025-03-04 17:04:16 +08:00 |
|
lys
|
bdfc9513c8
|
release/3.0.0.2502.01-合并业务线
|
2025-02-27 18:25:52 +08:00 |
|
lys
|
f211fadcb8
|
release/3.0.0.2502.01-合并业务线
|
2025-02-27 16:53:46 +08:00 |
|
lys
|
d47d74f856
|
release/3.0.0.2502.01-合并业务线
|
2025-02-21 17:43:08 +08:00 |
|
lys
|
88f3397ff8
|
Merge branch 'release/3.0.0.2502.01-合并业务线' into custom/领悦业务线
# Conflicts:
# pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
# pc4mobx/hrmSalary/layout.js
|
2025-02-21 17:00:56 +08:00 |
|
lys
|
298021d748
|
custom/领悦业务线
|
2025-02-21 16:56:43 +08:00 |
|
lys
|
5b2d59f787
|
custom/领悦业务线
|
2025-02-20 17:23:55 +08:00 |
|
lys
|
344e20799d
|
custom/领悦业务线
|
2025-02-20 14:58:35 +08:00 |
|
lys
|
1672909dd7
|
release/3.0.0.2502.01-合并业务线
|
2025-02-20 13:44:55 +08:00 |
|
lys
|
9fd83c7b34
|
custom/领悦业务线
|
2025-02-20 12:15:47 +08:00 |
|
lys
|
c0217a2608
|
release/3.0.0.2502.01-合并业务线
|
2025-02-20 11:32:32 +08:00 |
|
lys
|
2414c95179
|
custom/领悦业务线
|
2025-02-20 11:19:03 +08:00 |
|
lys
|
98b1c2bc08
|
release/3.0.0.2502.01-合并业务线
|
2025-02-19 16:26:58 +08:00 |
|
lys
|
2200784d4b
|
release/3.0.0.2502.01-合并业务线
|
2025-02-18 17:34:03 +08:00 |
|
lys
|
b6a0678f1a
|
release/3.0.0.2502.01-合并业务线
|
2025-02-18 17:30:21 +08:00 |
|
lys
|
7c85cbae4f
|
release/3.0.0.2502.01-合并业务线
|
2025-02-18 15:48:37 +08:00 |
|
lys
|
54adc6cc2e
|
release/3.0.0.2502.01-合并业务线
|
2025-02-18 15:42:40 +08:00 |
|
lys
|
75d7f97f1d
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.0.2502.01-合并业务线
|
2025-02-18 11:37:01 +08:00 |
|
lys
|
ea084c93a2
|
release/2.19.1.2501.01
路由模式页面报错
|
2025-02-18 09:08:07 +08:00 |
|
lys
|
e344eed2d0
|
release/2.19.1.2501.01
|
2025-02-17 18:40:39 +08:00 |
|
lys
|
4d9866401e
|
Merge branch 'feature/2.15.2.2411.01业务线-数据推送' into release/3.0.0.2502.01
|
2025-02-17 18:28:35 +08:00 |
|
lys
|
921f444f80
|
feature/2.15.2.2411.01业务线-数据推送
|
2025-02-17 18:28:21 +08:00 |
|
lys
|
824f4a9e86
|
Merge branch 'feature/2.15.2.2411.01业务线-数据推送' into release/3.0.0.2502.01
|
2025-02-17 09:56:08 +08:00 |
|
lys
|
537e019aad
|
custom/领悦业务线
|
2025-02-14 14:32:55 +08:00 |
|
lys
|
e34dbca6f7
|
custom/领悦业务线
|
2025-02-14 11:41:49 +08:00 |
|
lys
|
33d4126847
|
custom/领悦业务线
|
2025-02-14 11:14:06 +08:00 |
|
lys
|
b6dde18192
|
custom/领悦业务线
|
2025-02-14 10:51:41 +08:00 |
|
lys
|
46f7b08360
|
release/2.19.1.2501.01
|
2025-02-14 10:43:36 +08:00 |
|
lys
|
c0517462e7
|
release/2.19.1.2501.01
|
2025-02-13 15:19:18 +08:00 |
|
lys
|
002cb5522b
|
release/2.19.1.2501.01
|
2025-02-13 13:28:28 +08:00 |
|
lys
|
2357ee50a6
|
Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
|
2025-02-12 15:25:54 +08:00 |
|
lys
|
acf1257a27
|
release/2.19.1.2501.01
|
2025-02-11 14:32:53 +08:00 |
|
lys
|
ecf34e4886
|
release/2.19.1.2501.01
|
2025-02-11 14:17:56 +08:00 |
|
lys
|
eecb7f34f2
|
release/2.19.1.2501.01
|
2025-02-08 15:40:19 +08:00 |
|
lys
|
6b8b604f55
|
feature/2.19.1.2501.01-套打功能
|
2025-02-08 11:16:43 +08:00 |
|
lys
|
7fd6edb02d
|
feature/2.19.1.2501.01-套打功能
|
2025-02-07 16:44:09 +08:00 |
|
lys
|
17d29a543b
|
feature/2.19.1.2501.01-套打功能
|
2025-02-07 14:43:47 +08:00 |
|
lys
|
1a8e4bc9a4
|
custom/领悦业务线
|
2025-01-24 11:40:51 +08:00 |
|
lys
|
28f3eac7ec
|
custom/领悦业务线
|
2025-01-24 10:25:48 +08:00 |
|
lys
|
6722a5af50
|
custom/领悦业务线
|
2025-01-23 15:36:47 +08:00 |
|
lys
|
70ce4dcbca
|
custom/领悦业务线
|
2025-01-22 16:42:28 +08:00 |
|
lys
|
26152b6ca4
|
custom/领悦业务线
|
2025-01-22 15:15:43 +08:00 |
|
lys
|
a81408f7ee
|
custom/领悦业务线
|
2025-01-22 14:04:56 +08:00 |
|
lys
|
0c7ce42341
|
custom/领悦业务线
|
2025-01-22 11:44:56 +08:00 |
|
lys
|
7c317607ea
|
Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
|
2025-01-22 11:13:55 +08:00 |
|
lys
|
9ebba96698
|
Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送
|
2025-01-22 11:12:20 +08:00 |
|
lys
|
811083310b
|
release/2.19.1.2501.01
|
2025-01-14 14:02:24 +08:00 |
|
lys
|
40008f7a25
|
custom/领悦业务线
|
2025-01-13 13:20:41 +08:00 |
|
lys
|
023d57626e
|
custom/领悦业务线
|
2025-01-10 15:47:50 +08:00 |
|
lys
|
30bbcfb712
|
release/2.19.1.2501.01
|
2025-01-07 15:59:44 +08:00 |
|
lys
|
07ef0535c4
|
release/2.19.1.2501.01
|
2025-01-07 15:55:25 +08:00 |
|
lys
|
21a2e21c3f
|
release/2.19.1.2501.01
|
2025-01-06 10:48:52 +08:00 |
|
lys
|
13dc35f122
|
release/2.19.1.2501.01
|
2025-01-03 17:14:33 +08:00 |
|
lys
|
9740a9ef77
|
release/2.19.1.2501.01
|
2025-01-03 15:50:59 +08:00 |
|
lys
|
2c03908885
|
release/2.18.2.2412.02
|
2025-01-03 15:49:53 +08:00 |
|
lys
|
9c04b2adaf
|
release/2.18.2.2412.02
|
2025-01-03 11:40:39 +08:00 |
|
lys
|
8a904aa38a
|
Merge branch 'release/2.18.2.2412.02' into feature/2.15.2.2411.01业务线
|
2025-01-03 09:11:47 +08:00 |
|
lys
|
4212bf9ff5
|
release/2.18.2.2412.02
|
2025-01-02 15:31:55 +08:00 |
|
lys
|
446940095e
|
release/2.18.2.2412.02
|
2025-01-02 14:32:25 +08:00 |
|
lys
|
9d8cd5c6fa
|
release/2.18.2.2412.02
|
2024-12-31 16:07:35 +08:00 |
|
lys
|
db99c081fb
|
release/2.18.2.2412.02
|
2024-12-31 15:38:09 +08:00 |
|
lys
|
a8e2a53037
|
release/2.18.2.2412.02
|
2024-12-31 15:26:54 +08:00 |
|
lys
|
cdc75b7668
|
release/2.18.2.2412.02
|
2024-12-31 15:04:09 +08:00 |
|
lys
|
2d659768ac
|
release/2.18.2.2412.02
|
2024-12-31 13:42:33 +08:00 |
|
lys
|
a3f0e27f49
|
release/2.18.2.2412.02
|
2024-12-31 09:21:25 +08:00 |
|
lys
|
576a108fa9
|
release/2.18.2.2412.02
|
2024-12-30 16:55:47 +08:00 |
|
lys
|
69004fa1f1
|
Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送
|
2024-12-27 14:11:34 +08:00 |
|
lys
|
33280a603f
|
feature/2.15.2.2411.01业务线
|
2024-12-27 14:11:20 +08:00 |
|
lys
|
d6d7b7b545
|
Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送
|
2024-12-27 11:16:18 +08:00 |
|
lys
|
c00a678df1
|
feature/2.15.2.2411.01业务线
|
2024-12-27 11:16:06 +08:00 |
|
lys
|
fd8910e361
|
Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送
|
2024-12-27 11:03:11 +08:00 |
|
lys
|
eaded8d937
|
feature/2.15.2.2411.01业务线
|
2024-12-27 11:02:58 +08:00 |
|
lys
|
6a4f9cd2af
|
Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送
|
2024-12-27 09:16:26 +08:00 |
|
lys
|
322e6a9f96
|
Merge branch 'release/2.18.2.2412.02' into feature/2.15.2.2411.01业务线
|
2024-12-27 09:16:05 +08:00 |
|
lys
|
8aa696fee5
|
release/2.18.2.2412.02
|
2024-12-27 09:12:09 +08:00 |
|
lys
|
8b8f4cd610
|
release/2.18.2.2412.02
|
2024-12-25 17:20:55 +08:00 |
|
lys
|
e699a006d0
|
custom/领悦业务线
|
2024-12-25 11:00:31 +08:00 |
|
lys
|
5927da3deb
|
custom/领悦业务线
|
2024-12-25 09:00:58 +08:00 |
|
lys
|
cec22dc89f
|
release/2.18.2.2412.02
|
2024-12-24 15:41:15 +08:00 |
|
lys
|
c04cc1de76
|
release/2.18.2.2412.02
|
2024-12-23 15:28:05 +08:00 |
|
lys
|
cdd98ea602
|
release/2.18.1.2412.01
|
2024-12-20 16:36:50 +08:00 |
|
lys
|
197dac0988
|
Merge branch 'feature/2.15.2.2411.01业务线' into custom/领悦业务线
|
2024-12-17 16:05:22 +08:00 |
|
lys
|
de0054adb2
|
Merge branch 'release/2.18.1.2412.01' into feature/2.15.2.2411.01业务线
|
2024-12-17 16:04:50 +08:00 |
|
lys
|
ef1c529941
|
release/2.18.1.2412.01
|
2024-12-17 16:03:52 +08:00 |
|
lys
|
d9844eed9b
|
release/2.18.1.2412.01
|
2024-12-11 15:28:14 +08:00 |
|
lys
|
d2bd5befe7
|
feature/2.15.2.2411.01业务线
|
2024-12-10 14:07:12 +08:00 |
|
lys
|
8da06ed9ae
|
Merge branch 'release/2.18.1.2412.01' into feature/2.15.2.2411.01业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
|
2024-12-10 14:06:09 +08:00 |
|
lys
|
02a367befb
|
release/2.18.1.2412.01
薪资核算进度条处理
|
2024-12-10 09:11:12 +08:00 |
|
lys
|
eb66a32612
|
release/2.18.1.2412.01
|
2024-12-09 18:14:41 +08:00 |
|
lys
|
89b9e6110e
|
release/2.18.1.2412.01
|
2024-12-09 18:01:05 +08:00 |
|
lys
|
3871eb276a
|
1release/2.18.1.2412.01
|
2024-12-09 17:58:24 +08:00 |
|
lys
|
5f893b1eb0
|
release/2.18.1.2412.01
|
2024-12-09 17:37:44 +08:00 |
|
lys
|
a46f4869e5
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
|
2024-12-09 15:22:49 +08:00 |
|
lys
|
b69f30529d
|
Merge branch 'feature/2.17.1.2411.01-薪酬报表薪资明细显示模式' into release/2.17.1.2411.01
|
2024-12-05 10:51:06 +08:00 |
|
lys
|
5c8f045373
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-04 17:39:23 +08:00 |
|
lys
|
8a2891f454
|
release/2.17.1.2411.01
|
2024-12-04 17:06:29 +08:00 |
|
lys
|
5d817c9594
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-04 15:42:49 +08:00 |