 黎永顺
|
e4a80a0724
|
Merge branch 'release/3.0.0.2403.01' into release/3.0.0.2403.01-个税
|
2024-03-12 09:45:05 +08:00 |
|
黎永顺
|
20796bc14c
|
Merge branch 'hotfix/2.10.1.2402.01' into release/3.0.0.2403.01
|
2024-03-12 09:37:44 +08:00 |
|
黎永顺
|
e4d272481c
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-11 17:19:20 +08:00 |
|
黎永顺
|
c8406c34e0
|
Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税
|
2024-03-08 10:23:52 +08:00 |
|
黎永顺
|
650f10a1ea
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01
|
2024-03-08 10:22:00 +08:00 |
|
黎永顺
|
8d9dbcce92
|
Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/index.js
|
2024-03-07 10:48:31 +08:00 |
|
黎永顺
|
3b0f7bd5ce
|
薪酬报表设置修改
|
2024-03-07 10:31:56 +08:00 |
|
黎永顺
|
98624a5a0e
|
个税日志添加
|
2024-03-07 10:30:43 +08:00 |
|
黎永顺
|
d1f8f5d9aa
|
薪酬报表修复
|
2024-03-07 10:10:04 +08:00 |
|
黎永顺
|
dbc68102dd
|
日志bug修复
|
2024-03-07 09:48:11 +08:00 |
|
黎永顺
|
13e69fe5f2
|
Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税
|
2024-03-07 09:18:48 +08:00 |
|
黎永顺
|
f70d539ef4
|
日志bug修复
|
2024-03-07 09:09:07 +08:00 |
|
黎永顺
|
439ed5c822
|
hotfix/2.10.1.2402.01
|
2024-03-06 15:19:21 +08:00 |
|
黎永顺
|
4c8c3e7251
|
Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/index.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
# pc4mobx/hrmSalary/pages/declare/declare.js
|
2024-03-06 14:42:29 +08:00 |
|
黎永顺
|
0301618fc5
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01
|
2024-03-06 14:33:55 +08:00 |
|
黎永顺
|
fce72a71fc
|
hotfix/2.10.1.2402.01
|
2024-03-06 14:33:28 +08:00 |
|
黎永顺
|
3c30951bd0
|
Merge branch 'feature/2.10.1.2402.01-社保台账导入缓存' into release/2.10.1.2402.01
|
2024-03-06 14:08:15 +08:00 |
|
黎永顺
|
87d699c59d
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-06 14:04:47 +08:00 |
|
黎永顺
|
df9e9c9a21
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-05 17:49:37 +08:00 |
|
黎永顺
|
f732bcaafb
|
Merge branch 'feature/2.10.1.2401.01-页面操作日志添加' into release/2.10.1.2402.01
# Conflicts:
# pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
# pc4mobx/hrmSalary/stores/baseForm.js
|
2024-03-05 14:38:57 +08:00 |
|
黎永顺
|
3f23bc29e5
|
Merge branch 'feature/2.10.1.2402.01-我的薪资福利显示基础配置' into release/2.10.1.2402.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2024-03-05 14:25:33 +08:00 |
|
黎永顺
|
91bc849b49
|
feature/2.10.1.2402.01-社保台账导入缓存
|
2024-03-05 14:23:13 +08:00 |
|
黎永顺
|
22590c1577
|
feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发
|
2024-03-04 14:01:25 +08:00 |
|
黎永顺
|
2a7db5f6d3
|
feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发
|
2024-03-01 17:36:37 +08:00 |
|
黎永顺
|
88f03e0b0d
|
feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发
|
2024-03-01 16:56:32 +08:00 |
|
黎永顺
|
b57a95979d
|
feature/2.10.1.2402.01-个税-个税申报线下对比添加导出功能以及缓存对比项目的功能开发
|
2024-03-01 09:08:53 +08:00 |
|
黎永顺
|
752eb6b6d1
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-28 16:42:15 +08:00 |
|
黎永顺
|
5e9a9c2822
|
hotfix/2.10.1.2402.01
薪酬统计报表设置添加薪资账套的设置项
|
2024-02-28 15:48:22 +08:00 |
|
黎永顺
|
4ebcb8a066
|
release/2.10.1.2402.01-个税
|
2024-02-27 16:36:58 +08:00 |
|
黎永顺
|
c4d78463da
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01-个税
|
2024-02-27 16:34:26 +08:00 |
|
黎永顺
|
194e575e25
|
hotfix/2.10.1.2402.01
|
2024-02-27 16:33:50 +08:00 |
|
黎永顺
|
bfa0288585
|
release/2.10.1.2402.01-个税
人员信息报送添加姓名关键字搜索
|
2024-02-27 14:26:34 +08:00 |
|
黎永顺
|
07e19164d8
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-27 13:49:21 +08:00 |
|
黎永顺
|
86c5e50bb0
|
Merge branch 'hotfix/2.10.1.2402.01' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-27 11:34:28 +08:00 |
|
黎永顺
|
8ad3268401
|
Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01-个税
|
2024-02-27 11:33:30 +08:00 |
|
黎永顺
|
9120ee93d5
|
hotfix/2.10.1.2402.01
|
2024-02-27 11:32:54 +08:00 |
|
黎永顺
|
b42f9c8e13
|
feature/2.10.1.2402.01-我的薪资福利显示基础配置
|
2024-02-26 15:29:04 +08:00 |
|
黎永顺
|
ac479676e0
|
release/2.10.1.2402.01-个税
|
2024-02-23 17:38:42 +08:00 |
|
黎永顺
|
fbef758824
|
release/2.10.1.2402.01-个税
|
2024-02-23 16:30:20 +08:00 |
|
黎永顺
|
72b8c0e128
|
Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税
|
2024-02-23 16:21:04 +08:00 |
|
黎永顺
|
fe95424386
|
feature/2.10.1.2402.01-我的薪资福利显示基础配置
|
2024-02-23 16:20:29 +08:00 |
|
黎永顺
|
7b66f866df
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 15:59:06 +08:00 |
|
黎永顺
|
6f7b21ce5b
|
feature/2.10.1.2401.01-最优年终奖计税方案
|
2024-02-23 15:20:22 +08:00 |
|
黎永顺
|
7078b1c6c4
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 10:13:43 +08:00 |
|
黎永顺
|
2e2f8ee248
|
Merge branch 'release/2.10.1.2401.02' into release/2.10.1.2401.02-个税
|
2024-02-21 15:45:22 +08:00 |
|
黎永顺
|
949b907e89
|
Merge branch 'release/2.10.1.2401.02' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-21 10:50:36 +08:00 |
|
黎永顺
|
0e16bab13c
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-20 17:03:51 +08:00 |
|
黎永顺
|
eec52e34c1
|
Merge branch 'feature/2.10.1.2401.01-社保福利方案重构' into release/2.10.1.2401.02
|
2024-02-20 15:53:18 +08:00 |
|
黎永顺
|
2d6383eebc
|
Merge branch 'feature/2.10.1.2401.01-社保福利台账列表页面重构' into release/2.10.1.2401.02
|
2024-02-20 15:52:51 +08:00 |
|
黎永顺
|
e389d7f024
|
Merge branch 'feature/2.10.1.2401.01-工资单配置反馈开关' into release/2.10.1.2401.02
|
2024-02-20 15:52:20 +08:00 |