 黎永顺
|
30f76505fe
|
Merge branch 'hotfix/2.9.42310.01' into release/2.9.42309.01-个税
|
2023-09-25 16:21:22 +08:00 |
|
黎永顺
|
d9a6f3907c
|
hotfix/2.9.42310.01
表单字段隐藏的问题
|
2023-09-25 16:20:56 +08:00 |
|
黎永顺
|
1f37bdde4b
|
Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表'
|
2023-09-25 10:58:51 +08:00 |
|
黎永顺
|
9339c42d4d
|
Merge branch 'hotfix/2.9.42309.01-个税' into release/2.9.42309.01-个税
|
2023-09-22 11:15:40 +08:00 |
|
黎永顺
|
5a151f3910
|
hotfix/2.9.42309.01-个税
|
2023-09-22 11:14:48 +08:00 |
|
黎永顺
|
61637e6de7
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-21 18:18:47 +08:00 |
|
黎永顺
|
f7e895aaf0
|
Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税
|
2023-09-21 16:16:35 +08:00 |
|
黎永顺
|
12d4b5c33c
|
hotfix/2.9.42309.01
|
2023-09-21 16:13:18 +08:00 |
|
黎永顺
|
79546aaf63
|
Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税
|
2023-09-21 15:48:40 +08:00 |
|
黎永顺
|
e4d9a2c545
|
hotfix/2.9.42309.01
|
2023-09-21 15:45:58 +08:00 |
|
黎永顺
|
f8393fbe7d
|
Merge branch 'release/2.9.42309.01' into hotfix/2.9.42309.01
|
2023-09-21 15:21:10 +08:00 |
|
黎永顺
|
5b43e43f4a
|
hotfix/2.9.42309.01
|
2023-09-21 15:20:59 +08:00 |
|
黎永顺
|
1bd7d92073
|
Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税
# Conflicts:
# pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
# pc4mobx/hrmSalary/components/importDialog/index.js
# pc4mobx/hrmSalary/components/importDialog/index.less
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
|
2023-09-21 14:23:21 +08:00 |
|
黎永顺
|
0c1fdd7d13
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-21 14:16:40 +08:00 |
|
黎永顺
|
93a23cb9a3
|
Merge branch 'feature/2.9.42309.01-调薪记录添加二次密码认证' into release/2.9.42309.01
|
2023-09-21 14:16:25 +08:00 |
|
黎永顺
|
cfce462898
|
Merge branch 'feature/2.9.42309.01-薪酬统计报表分享报表' into release/2.9.42309.01
|
2023-09-21 14:16:06 +08:00 |
|
黎永顺
|
9030e22449
|
hotfix/2.9.42309.01
|
2023-09-21 12:04:55 +08:00 |
|
黎永顺
|
96032b5f1c
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-21 10:17:06 +08:00 |
|
黎永顺
|
e7e4d17cfa
|
hotfix/2.9.42309.01
|
2023-09-20 17:42:06 +08:00 |
|
黎永顺
|
c0220d8853
|
hotfix/2.9.42309.01
|
2023-09-20 17:29:50 +08:00 |
|
黎永顺
|
26fdf624bb
|
hotfix/2.9.42309.01
|
2023-09-20 17:25:56 +08:00 |
|
黎永顺
|
d664ad2769
|
feature/2.9.42309.01-薪酬统计报表分享报表
20230920
|
2023-09-20 17:03:24 +08:00 |
|
黎永顺
|
b22b41382f
|
hotfix/2.9.42309.01
20230920-社保福利方案添加搜索条件
|
2023-09-20 16:51:00 +08:00 |
|
黎永顺
|
d7c59f5434
|
feature/2.9.42309.01-薪酬统计报表分享报表
20230920
|
2023-09-20 15:03:05 +08:00 |
|
黎永顺
|
a58da11dc3
|
hotfix/2.9.42309.01
20230920
|
2023-09-20 14:20:51 +08:00 |
|
黎永顺
|
6ac979e9e7
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-20 09:25:10 +08:00 |
|
黎永顺
|
10c7280b43
|
feature/2.9.42309.01-薪酬统计报表分享报表
|
2023-09-19 17:24:52 +08:00 |
|
黎永顺
|
9211f9522c
|
Merge branch 'feature/2.9.42309.01-个税-数据采集累计专项附加扣除个税在线获取' into release/2.9.42309.01-个税
|
2023-09-18 13:38:52 +08:00 |
|
黎永顺
|
80d819a21b
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01-个税
|
2023-09-18 13:37:41 +08:00 |
|
黎永顺
|
b52afbb7c8
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-14 14:21:45 +08:00 |
|
黎永顺
|
85867da080
|
hotfix/2.9.42309.01
|
2023-09-14 14:19:08 +08:00 |
|
黎永顺
|
f18bda74f4
|
hotfix/2.9.42309.01
|
2023-09-14 11:50:22 +08:00 |
|
黎永顺
|
02be280127
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-14 10:38:10 +08:00 |
|
黎永顺
|
2b282b4211
|
hotfix/2.9.42309.01
|
2023-09-14 10:37:39 +08:00 |
|
黎永顺
|
3f18e4a0a7
|
feature/2.9.42309.01-调薪记录添加二次密码认证
|
2023-09-13 10:44:37 +08:00 |
|
黎永顺
|
5ce2f5bf31
|
hotfix/2.9.42308.02
|
2023-09-12 11:14:51 +08:00 |
|
黎永顺
|
a583087f5f
|
Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into release/2.9.42309.01
|
2023-09-11 13:43:28 +08:00 |
|
黎永顺
|
32404ec04e
|
Merge branch 'hotfix/2.9.42308.02' into release/2.9.42309.01
|
2023-09-11 13:43:04 +08:00 |
|
黎永顺
|
f5d42d8f75
|
Merge branch 'hotfix/2.9.42308.02'
|
2023-09-08 13:53:42 +08:00 |
|
黎永顺
|
8da781193a
|
hotfix/2.9.42308.02
|
2023-09-08 13:53:11 +08:00 |
|
黎永顺
|
b68578e82b
|
feature/2.9.42309.01-个税-数据采集累计专项附加扣除个税在线获取
|
2023-09-08 09:38:07 +08:00 |
|
黎永顺
|
adfaf2bf64
|
Merge branch 'feature/2.9.42309.01-个税-数据采集累计专项附加扣除个税在线获取' into release/2.9.42309.01-个税
|
2023-09-07 15:21:19 +08:00 |
|
黎永顺
|
6043192bfe
|
Merge branch 'feature/2.9.42308.02-薪资项目同步到薪资账套' into release/2.9.42309.01
|
2023-09-07 10:07:19 +08:00 |
|
黎永顺
|
2d148b9fb5
|
Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02-个税
# Conflicts:
# pc4mobx/hrmSalary/util/index.js
|
2023-09-06 16:30:21 +08:00 |
|
黎永顺
|
96f65e42b0
|
feature/2.9.42309.01-社保福利档案添加非系统人员列表
|
2023-09-06 14:54:45 +08:00 |
|
黎永顺
|
ce462fe51a
|
hotfix/2.9.42308.02
|
2023-09-06 14:27:23 +08:00 |
|
黎永顺
|
d330b0b40e
|
个税相关-往期累计情况添加在线获取的功能
|
2023-09-06 11:26:48 +08:00 |
|
黎永顺
|
f593e97207
|
feature社保福利档案添加非系统人员列表
|
2023-09-06 10:19:35 +08:00 |
|
黎永顺
|
bb1e328c92
|
feature社保福利档案添加非系统人员列表
|
2023-09-05 16:49:26 +08:00 |
|
黎永顺
|
2a40afb7b4
|
feature社保福利档案添加非系统人员列表
|
2023-09-05 15:14:05 +08:00 |