 黎永顺
|
84d4df6d3d
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 18:29:55 +08:00 |
|
黎永顺
|
b163858722
|
release/2.9.9.2312.01-个税
|
2023-11-29 15:38:10 +08:00 |
|
黎永顺
|
198c7c8b76
|
Merge branch 'feature/2.9.42310.01-薪资项目拓扑图' into release/2.9.9.2312.01-个税
|
2023-11-29 15:08:46 +08:00 |
|
黎永顺
|
79fca386d3
|
feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-29 14:02:53 +08:00 |
|
黎永顺
|
80cf2835d3
|
Merge branch 'master' into release/2.9.42311.02-个税
|
2023-11-28 15:25:28 +08:00 |
|
黎永顺
|
3da1d6964b
|
1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-28 15:24:48 +08:00 |
|
黎永顺
|
7d1b3f840f
|
Merge branch 'release/2.9.42311.02'
|
2023-11-28 13:53:37 +08:00 |
|
黎永顺
|
7cc9e422b1
|
1feature/2.9.9.2312.01-社保核算以及薪资账套查询优化
|
2023-11-28 13:44:53 +08:00 |
|
黎永顺
|
23f15bd423
|
feature/2.9.42311.02-社保核算以及薪资账套查询优化
|
2023-11-27 19:17:44 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
bbb9bce35a
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-11-24 13:55:58 +08:00 |
|
黎永顺
|
6f9f24f7a8
|
feature/2.9.42310.01-工资单发放页面重构-添加短信设置的发送设置
|
2023-11-23 15:50:21 +08:00 |
|
黎永顺
|
94b3f056f4
|
hotfix/2.9.42311.02-我的薪资福利页面重构
|
2023-11-20 17:48:44 +08:00 |
|
黎永顺
|
4ffd2731ee
|
Merge branch 'hotfix/2.9.42311.02' into release/2.9.42311.02-个税
|
2023-11-17 13:47:56 +08:00 |
|
黎永顺
|
373b0aad56
|
hotfix/2.9.42311.02
|
2023-11-17 13:33:56 +08:00 |
|
黎永顺
|
f4574570d9
|
hotfix/2.9.42311.02
|
2023-11-15 13:53:56 +08:00 |
|
黎永顺
|
f0b657f26e
|
Merge branch 'release/2.9.42311.02' into hotfix/2.9.42311.02
|
2023-11-15 13:32:40 +08:00 |
|
黎永顺
|
7dfd328aae
|
hotfix/2.9.42311.02
|
2023-11-14 14:45:13 +08:00 |
|
黎永顺
|
ff870c110c
|
hotfix/2.9.42311.02-薪资核算名称修改
|
2023-11-13 16:51:40 +08:00 |
|
黎永顺
|
f51de57661
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 15:49:45 +08:00 |
|
黎永顺
|
1d110fe25d
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 15:35:43 +08:00 |
|
黎永顺
|
115a0ee64f
|
Merge branch 'hotfix/2.9.42311.02'
|
2023-11-13 14:18:16 +08:00 |
|
黎永顺
|
0798d2bf96
|
hotfix/2.9.42311.02
|
2023-11-13 14:15:49 +08:00 |
|
黎永顺
|
3ab54027f9
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 14:13:03 +08:00 |
|
黎永顺
|
9f114e9867
|
hotfix/2.9.42311.02
|
2023-11-13 11:17:38 +08:00 |
|
黎永顺
|
28c50dc563
|
hotfix/2.9.42311.02
|
2023-11-13 11:03:19 +08:00 |
|
黎永顺
|
0a1173faaa
|
feature/2.9.42311.02-我的薪资福利移动端列表查看
|
2023-11-13 10:41:47 +08:00 |
|
黎永顺
|
3ec45fc1ba
|
Merge branch 'release/2.9.42311.01' into release/2.9.42311.01-个税
|
2023-11-10 13:35:41 +08:00 |
|
黎永顺
|
7908f925ea
|
release/2.9.42311.01
|
2023-11-09 16:27:33 +08:00 |
|
黎永顺
|
c194711c78
|
Merge branch 'release/2.9.42311.01' into release/2.9.42310.01-个税
|
2023-11-09 15:36:38 +08:00 |
|
黎永顺
|
1afaa04129
|
1release/2.9.42311.01
|
2023-11-09 15:36:13 +08:00 |
|
黎永顺
|
b1ac23227a
|
合并1101的代码以及添加个税扣缴义务人中的非系统人员配置
|
2023-11-09 10:27:20 +08:00 |
|
黎永顺
|
62704f5825
|
Merge branch 'release/2.9.42311.01' into release/2.9.42310.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
|
2023-11-09 10:26:44 +08:00 |
|
黎永顺
|
8252cebd98
|
1release/2.9.42311.01
|
2023-11-08 18:11:38 +08:00 |
|
黎永顺
|
84a908e94e
|
feature/2.9.42310.02-社保福利档案页面重构
|
2023-11-08 16:14:10 +08:00 |
|
黎永顺
|
a075c4a479
|
Merge branch 'feature/2.9.42310.01-社保档案操作日志' into release/2.9.42311.01
|
2023-11-07 19:16:27 +08:00 |
|
黎永顺
|
147d0908f1
|
Merge branch 'feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置' into release/2.9.42311.01
# Conflicts:
# pc4mobx/hrmSalary/apis/statistics.js
|
2023-11-07 19:16:10 +08:00 |
|
黎永顺
|
d9a7814080
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-07 16:43:23 +08:00 |
|
黎永顺
|
5fd2120f14
|
feature/2.9.42310.01-统计维度管理弹框修改以及添加人员的扩展属性设置
|
2023-11-07 16:21:17 +08:00 |
|
黎永顺
|
858b694568
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-07 11:26:08 +08:00 |
|
黎永顺
|
8bd1cd51af
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-06 17:05:26 +08:00 |
|
黎永顺
|
560af8a703
|
feature/2.9.42310.01-接口fetch重新封装
|
2023-11-06 09:24:47 +08:00 |
|
黎永顺
|
f9f47324e5
|
feature/2.9.42310.02-薪酬统计报表统计项目设置
|
2023-11-02 14:30:18 +08:00 |
|
黎永顺
|
963b5492ef
|
Merge branch 'hotfix/2.9.42310.02' into release/2.9.42310.01-个税
|
2023-11-01 16:20:18 +08:00 |
|
黎永顺
|
a21982bf62
|
hotfix/2.9.42310.02
|
2023-10-31 15:50:52 +08:00 |
|
黎永顺
|
6aed11a411
|
hotfix/2.9.42310.02
|
2023-10-31 15:45:15 +08:00 |
|
黎永顺
|
e246e10af7
|
hotfix/2.9.42310.02
|
2023-10-30 15:54:25 +08:00 |
|
黎永顺
|
4acdff060c
|
hotfix/2.9.42310.02
|
2023-10-30 08:55:15 +08:00 |
|
黎永顺
|
32e01016c1
|
hotfix/2.9.42310.02
|
2023-10-27 16:27:01 +08:00 |
|
黎永顺
|
eed8d3a5bd
|
feature/2.9.42310.01-薪资项目拓扑图
|
2023-10-27 16:14:59 +08:00 |