 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 |
|
lys
|
64777b4129
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/util/index.js
|
2024-12-03 13:21:36 +08:00 |
|
lys
|
154d69d850
|
release/2.17.1.2411.01
|
2024-11-27 14:49:03 +08:00 |
|
lys
|
b0b67230ce
|
release/2.17.1.2411.01
|
2024-11-27 14:42:04 +08:00 |
|
lys
|
ce4c2a7c72
|
release/2.17.1.2411.01
|
2024-11-27 10:59:24 +08:00 |
|
lys
|
8786ef1f2a
|
release/2.17.1.2411.01
|
2024-11-27 10:32:21 +08:00 |
|
lys
|
e613772041
|
release/2.17.1.2411.01
|
2024-11-27 10:21:51 +08:00 |
|
lys
|
9618a9b5d3
|
release/2.17.1.2411.01
|
2024-11-26 17:01:50 +08:00 |
|
lys
|
a048a561a5
|
release/2.17.1.2411.01
|
2024-11-26 14:56:03 +08:00 |
|
lys
|
179e58357d
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/util/index.js
|
2024-11-26 14:40:33 +08:00 |
|
lys
|
7c13ddb970
|
release/2.17.1.2411.01
|
2024-11-25 18:08:50 +08:00 |
|
lys
|
dda961cacf
|
release/2.17.1.2411.01
|
2024-11-25 17:51:49 +08:00 |
|
lys
|
18029e6dba
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-25 14:57:11 +08:00 |
|
lys
|
ad0bdc33ce
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-25 10:24:03 +08:00 |
|
lys
|
571026ebf8
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-21 14:10:47 +08:00 |
|
lys
|
a5cc09a2c5
|
release/2.17.1.2411.01
|
2024-11-20 16:25:59 +08:00 |
|
lys
|
18a87cb45c
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-20 15:30:14 +08:00 |
|
lys
|
a2c5fdc5ec
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-19 18:58:39 +08:00 |
|
lys
|
da79b1b7ff
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-19 13:28:04 +08:00 |
|
lys
|
8a0998e26c
|
release/2.17.1.2411.01
|
2024-11-19 10:54:33 +08:00 |
|
lys
|
2261cf3104
|
release/2.17.1.2411.01
|
2024-11-19 10:31:10 +08:00 |
|
lys
|
4473d8dad5
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-19 09:56:29 +08:00 |
|
lys
|
5014859171
|
Merge branch 'release/2.17.1.2411.01' into feature/测试
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js
# pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
|
2024-11-15 15:06:16 +08:00 |
|
lys
|
b0a45c9bbe
|
Merge branch 'feature/2.16.1.2410.01-薪资账套配置流程审批' into release/2.17.1.2411.01
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-11-14 09:36:26 +08:00 |
|
lys
|
e09f4da1cf
|
release/2.17.1.2411.01
|
2024-11-13 10:19:57 +08:00 |