 lys
|
e7a65659ac
|
Merge branch 'release/2.19.1.2501.01' into custom-联特
|
2025-04-17 17:13:08 +08:00 |
|
lys
|
a30974907c
|
custom-联特
|
2025-04-17 15:31:00 +08:00 |
|
lys
|
854a49b018
|
release/2.19.1.2501.01
|
2025-04-16 15:51:28 +08:00 |
|
lys
|
51d9c58888
|
release/2.19.1.2501.01
|
2025-04-15 16:27:19 +08:00 |
|
lys
|
6dfb4e6650
|
release/2.19.1.2501.01
|
2025-04-15 16:13:15 +08:00 |
|
lys
|
38572729fd
|
release/3.0.1.2504.01-合并业务线
|
2025-04-15 15:16:29 +08:00 |
|
lys
|
80307c7b91
|
release/2.19.1.2501.01
|
2025-04-14 16:38:41 +08:00 |
|
lys
|
a81cc3b1cb
|
Merge branch 'release/3.0.1.2503.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-04-08 16:40:03 +08:00 |
|
lys
|
4059e8364e
|
release/3.0.1.2503.01-合并业务线
|
2025-04-02 16:16:38 +08:00 |
|
lys
|
4df7696f01
|
release/3.0.1.2503.01-合并业务线
|
2025-04-02 10:50:19 +08:00 |
|
lys
|
122005be2b
|
release/3.0.1.2503.01-合并业务线
|
2025-04-01 17:46:38 +08:00 |
|
lys
|
8bb09affaa
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-04-01 15:07:50 +08:00 |
|
lys
|
1bbaa93c69
|
Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
|
2025-04-01 15:07:29 +08:00 |
|
lys
|
867a0dc58c
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-04-01 15:07:05 +08:00 |
|
lys
|
3b2a987778
|
release/2.19.1.2501.01
|
2025-04-01 15:05:59 +08:00 |
|
lys
|
925bc0f75a
|
release/2.19.1.2501.01
|
2025-04-01 15:05:39 +08:00 |
|
lys
|
7fe358db57
|
Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
|
2025-04-01 11:29:03 +08:00 |
|
lys
|
cfe8117bbf
|
release/2.19.1.2501.01-个税
|
2025-04-01 11:28:41 +08:00 |
|
lys
|
41a6afdb40
|
release/2.19.1.2501.01-个税
|
2025-03-31 16:11:37 +08:00 |
|
lys
|
fe4985fa9b
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-27 15:33:10 +08:00 |
|
lys
|
ae35d29e36
|
Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
|
2025-03-27 15:30:43 +08:00 |
|
lys
|
20da3fd4eb
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-27 15:30:16 +08:00 |
|
lys
|
bb3ded5692
|
release/2.19.1.2501.01
|
2025-03-27 15:28:53 +08:00 |
|
lys
|
c3284fa160
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-27 13:51:01 +08:00 |
|
lys
|
2e818defdb
|
Merge branch 'release/3.0.1.2503.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-03-27 13:50:25 +08:00 |
|
lys
|
10b45fdfb9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
|
2025-03-27 13:50:03 +08:00 |
|
lys
|
b443a56679
|
release/2.19.1.2501.01
|
2025-03-27 13:46:53 +08:00 |
|
lys
|
154b16ad6e
|
release/2.19.1.2503.01-业务线个税
|
2025-03-27 13:19:59 +08:00 |
|
lys
|
0d55c14f0b
|
release/2.19.1.2501.01-个税
|
2025-03-27 11:32:11 +08:00 |
|
lys
|
87870e9101
|
release/2.19.1.2501.01-个税
|
2025-03-27 10:41:22 +08:00 |
|
lys
|
1549eab2ee
|
release/2.19.1.2501.01-个税
|
2025-03-27 09:40:20 +08:00 |
|
lys
|
6a81dd9c76
|
release/2.19.1.2503.01-业务线个税
|
2025-03-26 17:19:52 +08:00 |
|
lys
|
461944eced
|
release/2.19.1.2501.01-个税
|
2025-03-26 16:47:59 +08:00 |
|
lys
|
904964ada8
|
Merge branch 'release/3.0.1.2503.01-合并业务线' into release/2.19.1.2503.01-业务线个税
# Conflicts:
# pc4mobx/hrmSalary/apis/taxAgent.js
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
# pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
# pc4mobx/hrmSalary/pages/salary/components/baseSettings.js
# pc4mobx/hrmSalary/pages/salary/components/comHint.js
# pc4mobx/hrmSalary/pages/salary/components/constants.js
# pc4mobx/hrmSalary/pages/salary/components/index.less
# pc4mobx/hrmSalary/pages/salary/components/personalScope.js
# pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
# pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
# pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
# pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
# pc4mobx/hrmSalary/pages/salary/taxAgent.js
# pc4mobx/hrmSalary/util/index.js
|
2025-03-26 16:16:22 +08:00 |
|
lys
|
7fcd9afbed
|
release/2.19.1.2501.01-个税
|
2025-03-26 15:46:50 +08:00 |
|
lys
|
a0c1ab548c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-26 13:44:50 +08:00 |
|
lys
|
2618a2c12f
|
release/2.19.1.2501.01
|
2025-03-26 13:44:24 +08:00 |
|
lys
|
50c6bab3c2
|
Merge branch 'feature/3.0.1.2503.01-合并业务线-社保福利台账明细整改' into release/3.0.1.2503.01-合并业务线测试合并
|
2025-03-26 09:31:18 +08:00 |
|
lys
|
5c0996296b
|
release/3.0.1.2503.01-合并业务线
|
2025-03-25 16:33:51 +08:00 |
|
lys
|
1d341110f5
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-24 13:55:02 +08:00 |
|
lys
|
bbf362140f
|
custom/万新光学
|
2025-03-24 13:54:45 +08:00 |
|
lys
|
60747a5d78
|
release/2.19.1.2501.01-个税
|
2025-03-20 13:42:59 +08:00 |
|
lys
|
1e63f9058c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-19 18:04:58 +08:00 |
|
lys
|
c282a71e86
|
release/2.19.1.2501.01
|
2025-03-19 18:04:38 +08:00 |
|
lys
|
a0385789cb
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-19 16:31:31 +08:00 |
|
lys
|
bb79a3f54c
|
release/3.0.1.2503.01-合并业务线
|
2025-03-19 10:40:35 +08:00 |
|
lys
|
3368323786
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-19 10:16:43 +08:00 |
|
lys
|
e4aaf5e8e4
|
release/2.19.1.2501.01
|
2025-03-19 09:36:12 +08:00 |
|
lys
|
f436779b9e
|
release/2.19.1.2501.01
|
2025-03-13 17:41:34 +08:00 |
|
lys
|
c690e27517
|
feature/3.0.1.2503.01-合并业务线-社保福利台账明细整改
|
2025-03-13 17:39:51 +08:00 |