 黎永顺
|
7826086cb1
|
Merge branch 'release/2.14.4.2406.02' into release/2.14.4.2406.02-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
|
2024-06-21 10:49:13 +08:00 |
|
黎永顺
|
bf0ce0ecac
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02
|
2024-06-21 10:44:32 +08:00 |
|
黎永顺
|
a4e072e3ee
|
hotfix/2.14.2.2406.02
|
2024-06-21 10:05:47 +08:00 |
|
黎永顺
|
d2b8906773
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02
|
2024-06-20 17:26:13 +08:00 |
|
黎永顺
|
6bb79ab685
|
hotfix/2.14.2.2406.02
|
2024-06-20 17:25:55 +08:00 |
|
黎永顺
|
d229730efe
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02
|
2024-06-20 17:18:32 +08:00 |
|
黎永顺
|
3ba1544842
|
hotfix/2.14.2.2406.02
|
2024-06-20 17:18:12 +08:00 |
|
黎永顺
|
9a9a934fb7
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02
|
2024-06-20 14:06:36 +08:00 |
|
黎永顺
|
4d56e8284f
|
hotfix/2.14.2.2406.02
|
2024-06-20 14:06:16 +08:00 |
|
黎永顺
|
7d47a0b4fd
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02
|
2024-06-20 11:17:50 +08:00 |
|
黎永顺
|
93c39cad41
|
hotfix/2.14.2.2406.02
|
2024-06-20 11:17:30 +08:00 |
|
黎永顺
|
4a5328791d
|
Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02
|
2024-06-20 10:04:44 +08:00 |
|
黎永顺
|
6f29f9c56a
|
hotfix/2.14.2.2406.02
|
2024-06-20 09:15:07 +08:00 |
|
黎永顺
|
c39515d7f9
|
hotfix/2.14.2.2406.02
|
2024-06-19 11:43:08 +08:00 |
|
黎永顺
|
823788e531
|
hotfix/2.14.2.2406.02
|
2024-06-19 11:24:59 +08:00 |
|
黎永顺
|
10c7903892
|
hotfix/2.14.2.2406.02
|
2024-06-18 17:48:08 +08:00 |
|
黎永顺
|
e50be3d3f3
|
Merge branch 'feature/2.14.4.2406.02-工资单发放预览' into release/2.14.4.2406.02
|
2024-06-18 15:31:19 +08:00 |
|
黎永顺
|
1c67adbd25
|
feature/2.14.4.2406.02-工资单发放预览
|
2024-06-18 15:30:46 +08:00 |
|
黎永顺
|
7221d910ca
|
hotfix/2.14.2.240默认值
|
2024-06-18 10:44:48 +08:00 |
|
黎永顺
|
2e775eb205
|
feature/2.14.4.2406.02-工资单发放预览
|
2024-06-18 09:07:43 +08:00 |
|
黎永顺
|
40fe79c0e5
|
hotfix/2.14.2.2406.02
|
2024-06-17 17:24:21 +08:00 |
|
黎永顺
|
4ebb3a422e
|
feature/2.14.4.2406.02-工资单发放预览
|
2024-06-17 17:20:01 +08:00 |
|
黎永顺
|
e0b6dc4585
|
feature/2.14.4.2406.02-工资单发放预览
|
2024-06-17 16:47:08 +08:00 |
|
黎永顺
|
add6a70abd
|
hotfix/2.14.2.2406.02
|
2024-06-17 16:17:16 +08:00 |
|
黎永顺
|
f4cbacd591
|
hotfix/2.14.2.2406.02
|
2024-06-14 16:33:26 +08:00 |
|
黎永顺
|
12a7871ef0
|
Merge branch 'release/2.14.4.2406.02' into release/2.14.4.2406.02-个税
|
2024-06-14 10:31:55 +08:00 |
|
黎永顺
|
24f9d7e57f
|
hotfix/2.14.2.2406.02
|
2024-06-13 09:06:22 +08:00 |
|
黎永顺
|
c80a1c73fe
|
hotfix/2.14.2.2406.02
|
2024-06-12 18:56:02 +08:00 |
|
黎永顺
|
1ddcab4f38
|
hotfix/2.14.2.2406.02
|
2024-06-12 17:38:34 +08:00 |
|
黎永顺
|
76db508066
|
产品优化 - 社保福利台账小数位数优化
|
2024-06-11 15:27:22 +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 |
|
黎永顺
|
15c81c8156
|
release/2.14.3.2406.01
|
2024-06-06 17:25:31 +08:00 |
|
黎永顺
|
1a2bf2bc6e
|
0release/2.14.3.2406.01
|
2024-06-05 09:10:04 +08:00 |
|
黎永顺
|
fa0a4859e9
|
release/2.14.3.2406.01-个税
|
2024-06-03 11:38:47 +08:00 |
|
黎永顺
|
037ab5b12f
|
release/2.14.3.2406.01-个税
|
2024-06-03 11:22:18 +08:00 |
|
黎永顺
|
6d89db8dfe
|
Merge branch 'feature/2.14.3.2406.01-薪资核算添加锁定人员数据' into release/2.14.3.2406.01
|
2024-05-30 17:07:50 +08:00 |
|
黎永顺
|
c9f4f23927
|
Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.3.2406.01
|
2024-05-30 17:07:21 +08:00 |
|
黎永顺
|
017a04a0c4
|
hotfix/2.14.2.2405.02
|
2024-05-30 14:15:55 +08:00 |
|
黎永顺
|
1935a552df
|
release/2.14.3.2406.01-个税
|
2024-05-29 11:07:05 +08:00 |
|
黎永顺
|
6bfde3d28f
|
feature/2.14.3.2406.01-薪资核算添加锁定人员数据
|
2024-05-29 10:32:41 +08:00 |
|
黎永顺
|
c0079fe4b4
|
feature/2.14.3.2406.01-薪资核算添加锁定人员数据
|
2024-05-29 10:32:17 +08:00 |
|
黎永顺
|
c87e62815c
|
Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.3.2406.01
|
2024-05-28 16:42:39 +08:00 |
|
黎永顺
|
411ba9744b
|
hotfix/2.14.2.2405.02
|
2024-05-28 16:42:21 +08:00 |
|
黎永顺
|
3418bfe4aa
|
hotfix/2.14.2.2405.02
公式编辑
|
2024-05-28 16:25:25 +08:00 |
|
黎永顺
|
0b4b7b28ea
|
Merge branch 'release/2.14.2.2405.02' into release/2.14.2.2405.02-个税
|
2024-05-28 11:43:11 +08:00 |
|
黎永顺
|
53b6058b7e
|
Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.2.2405.02
|
2024-05-28 11:42:42 +08:00 |
|
黎永顺
|
bd811da894
|
hotfix/2.14.2.2405.02
工资单查看报错
|
2024-05-28 11:42:26 +08:00 |
|
黎永顺
|
b9562831ff
|
Merge branch 'release/2.14.2.2405.02' into release/2.14.2.2405.02-个税
|
2024-05-27 16:54:36 +08:00 |
|
黎永顺
|
c6cc7c5cea
|
Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.2.2405.02
|
2024-05-27 16:52:19 +08:00 |
|
黎永顺
|
9577462831
|
hotfix/2.14.2.2405.02
|
2024-05-24 09:57:35 +08:00 |