 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 |
|
lys
|
2fd0dfcf50
|
feature/3.0.1.2503.01-合并业务线-社保福利台账明细整改
|
2025-03-13 15:19:40 +08:00 |
|
lys
|
477913a724
|
Merge branch 'release/2.19.1.2501.01' into feature/3.0.1.2503.01-合并业务线-社保福利台账明细整改
|
2025-03-12 14:48:13 +08:00 |
|
lys
|
f7dfcdf8a6
|
release/2.19.1.2501.01
|
2025-03-12 13:57:48 +08:00 |
|
lys
|
4a3a6766ba
|
release/3.0.1.2503.01-合并业务线
|
2025-03-12 13:56:44 +08:00 |
|
lys
|
00c212a523
|
release/3.0.1.2503.01-合并业务线
|
2025-03-12 13:56:01 +08:00 |
|
lys
|
645c9ff5eb
|
release/3.0.0.2502.01-合并业务线
|
2025-03-11 09:38:06 +08:00 |
|
lys
|
6aa12027b8
|
release/3.0.0.2502.01-合并业务线
|
2025-03-10 18:11:59 +08:00 |
|
lys
|
9f13efa0f2
|
Merge branch 'feature/3.0.0.2502.01-合并业务线-社保福利台账增减人员' into release/3.0.0.2502.01-合并业务线
|
2025-03-10 15:31:44 +08:00 |
|
lys
|
bc79bfe16e
|
feature/3.0.0.2502.01-合并业务线-社保福利台账增减人员
|
2025-03-10 15:31:26 +08:00 |
|
lys
|
f7bf13bd69
|
release/3.0.0.2502.01-合并业务线
|
2025-03-10 14:50:07 +08:00 |
|
lys
|
93dde8230a
|
release/2.19.1.2501.01
|
2025-03-10 14:48:15 +08:00 |
|
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
|
c1dd08602b
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-04 09:10:28 +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
|
1672909dd7
|
release/3.0.0.2502.01-合并业务线
|
2025-02-20 13:44:55 +08:00 |
|
lys
|
c0217a2608
|
release/3.0.0.2502.01-合并业务线
|
2025-02-20 11:32:32 +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 |