Commit Graph

2123 Commits

Author SHA1 Message Date
lys 811083310b release/2.19.1.2501.01 2025-01-14 14:02:24 +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 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 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
lys f771d2eacc feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-04 10:46:25 +08:00
lys b61dc20db5 feature/2.17.1.2411.01-薪酬报表薪资明细显示模式 2024-12-03 18:38:14 +08:00
lys ed5b694859 Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线 2024-12-03 17:11:39 +08:00
lys 373e093321 release/2.17.1.2411.01 2024-12-03 17:01:12 +08:00