 lys
|
fea2c5921e
|
custom/钱智
|
2025-10-28 15:07:15 +08:00 |
|
lys
|
f749fbcea3
|
custom/钱智
|
2025-08-26 13:57:31 +08:00 |
|
lys
|
f8684ce32d
|
Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
|
2025-07-02 18:35:08 +08:00 |
|
lys
|
96f754728c
|
release/2.19.1.2501.01-个税
|
2025-07-02 18:31:51 +08:00 |
|
lys
|
02a86cdb3d
|
release/2.19.1.2501.01-个税
|
2025-07-02 14:55:02 +08:00 |
|
lys
|
a558c30fc8
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-05-13 10:00:46 +08:00 |
|
lys
|
ac43423f96
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-04-25 17:40:08 +08:00 |
|
lys
|
334a7660a9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-24 16:59:41 +08:00 |
|
lys
|
dee1059ca7
|
release/2.19.1.2501.01
|
2025-04-24 16:38:36 +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
|
41a6afdb40
|
release/2.19.1.2501.01-个税
|
2025-03-31 16:11:37 +08:00 |
|
lys
|
154b16ad6e
|
release/2.19.1.2503.01-业务线个税
|
2025-03-27 13:19: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
|
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
|
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
|
002cb5522b
|
release/2.19.1.2501.01
|
2025-02-13 13:28:28 +08:00 |
|
lys
|
44dde8cf51
|
release/2.19.1.2501.01-个税
|
2025-01-06 18:07:39 +08:00 |
|
lys
|
23d32f627b
|
release/2.19.1.2501.01-个税
|
2025-01-06 10:39:25 +08:00 |
|
lys
|
726890774c
|
release/2.18.2.2412.02-个税
|
2024-12-30 10:52:11 +08:00 |
|
lys
|
2e466c662f
|
release/2.18.2.2412.02-个税
|
2024-12-27 15:58:48 +08:00 |
|
lys
|
f111164783
|
release/2.18.2.2412.02-个税
|
2024-12-27 14:09:55 +08:00 |
|
lys
|
1d88fd9f35
|
release/2.18.2.2412.02-release/2.18.2.2412.02-个税
|
2024-12-26 18:12:37 +08:00 |
|
lys
|
e8f820058b
|
release/2.18.2.2412.02-个税
|
2024-12-25 10:54:45 +08:00 |
|
lys
|
420104e131
|
release/2.18.2.2412.02-release/2.18.2.2412.02-个税
|
2024-12-24 18:09:15 +08:00 |
|
lys
|
e0b387503b
|
release/2.18.2.2412.02-个税
|
2024-12-24 15:36:46 +08:00 |
|
lys
|
2574959c54
|
release/2.18.1.2412.01-个税
|
2024-12-19 15:45:20 +08:00 |
|
lys
|
f2b957578d
|
Merge branch 'release/2.17.1.2411.01' into release/2.17.1.2411.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
|
2024-12-09 15:28:31 +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
|
8a2891f454
|
release/2.17.1.2411.01
|
2024-12-04 17:06:29 +08:00 |
|
lys
|
55bbe0ca39
|
release/2.17.1.2411.01-个税
|
2024-11-19 14:52:14 +08:00 |
|
lys
|
d5ecc6ae74
|
Merge branch 'release/2.17.1.2411.01' into release/2.17.1.2411.01-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/ledger.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
|
2024-11-19 13:40:34 +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
|
66c6c68460
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-31 10:22:16 +08:00 |
|
lys
|
004175f882
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 16:23:58 +08:00 |
|
lys
|
5e2f6bbbbc
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 10:59:46 +08:00 |
|
lys
|
c5a62b3c26
|
custom/京贵投资
|
2024-10-30 10:20:43 +08:00 |
|
lys
|
15acb33aa0
|
release/2.16.1.2410.01-个税
|
2024-10-18 15:47:24 +08:00 |
|
黎永顺
|
02b085c051
|
权限
|
2024-09-20 16:30:12 +08:00 |
|
黎永顺
|
3f0502aabf
|
feature/2.15.1.2407.01-权限
|
2024-09-13 11:12:53 +08:00 |
|
黎永顺
|
4a386102ef
|
feature/2.15.1.2407.01-权限
|
2024-09-12 16:34:39 +08:00 |
|
黎永顺
|
3c33fc7a3a
|
feature/2.15.1.2407.01-权限
|
2024-09-12 13:53:47 +08:00 |
|
黎永顺
|
394d7152f4
|
feature/2.15.1.2407.01-权限
|
2024-09-12 13:13:51 +08:00 |
|
黎永顺
|
90ee27ba2e
|
Merge branch 'release/2.15.1.2407.01' into release/2.15.1.2407.01-个税
|
2024-08-16 09:39:58 +08:00 |
|
黎永顺
|
99d93b041e
|
hotfix/2.15.1.2407.01
|
2024-08-07 14:05:32 +08:00 |
|
黎永顺
|
334a582d62
|
hotfix/2.15.1.2407.01
考勤引用，薪资账套多选
|
2024-08-07 11:11:53 +08:00 |
|
黎永顺
|
92d72d3eac
|
release/2.14.4.2406.02-个税
|
2024-07-03 11:12:15 +08:00 |
|
黎永顺
|
84f6d25b51
|
Merge branch 'release/2.14.3.2406.01' into release/2.14.3.2406.01-个税
|
2024-06-11 10:52:50 +08:00 |
|
黎永顺
|
037ab5b12f
|
release/2.14.3.2406.01-个税
|
2024-06-03 11:22:18 +08:00 |
|
黎永顺
|
017a04a0c4
|
hotfix/2.14.2.2405.02
|
2024-05-30 14:15:55 +08:00 |
|
黎永顺
|
781bf21dd7
|
Merge branch 'release/2.12.1.2404.02' into release/2.12.1.2404.02-个税
|
2024-05-08 14:06:43 +08:00 |