 lys
|
02a86cdb3d
|
release/2.19.1.2501.01-个税
|
2025-07-02 14:55:02 +08:00 |
|
lys
|
4698ff8b17
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-06-25 14:50:21 +08:00 |
|
lys
|
e7efc52f41
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into custom/钱智
|
2025-06-19 14:08:01 +08:00 |
|
lys
|
8eadce0ce3
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-06-19 14:03:55 +08:00 |
|
lys
|
0ec1cd1cb1
|
release/2.19.1.2501.01
|
2025-06-19 13:43:35 +08:00 |
|
lys
|
7127e7fc19
|
Merge branch 'release/2.19.1.2503.01-业务线个税' into custom/钱智
|
2025-06-19 11:06:24 +08:00 |
|
lys
|
ac0ba88f71
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-06-19 11:06:04 +08:00 |
|
lys
|
72e100bcc7
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into custom/钱智
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
|
2025-06-19 11:05:38 +08:00 |
|
lys
|
2b8892f798
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-06-18 15:43:13 +08:00 |
|
lys
|
c356c4f0db
|
release/2.19.1.2501.01
|
2025-06-18 09:29:55 +08:00 |
|
lys
|
e244468854
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-06-12 11:04:57 +08:00 |
|
lys
|
b0e7cbfc41
|
release/3.0.1.2504.01-合并业务线
|
2025-06-12 10:37:23 +08:00 |
|
lys
|
dc80b9c0b7
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-06-12 09:30:02 +08:00 |
|
lys
|
45056afe54
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-06-04 13:47:43 +08:00 |
|
lys
|
2b639ad388
|
custom/五院杭州中心
|
2025-05-27 12:31:43 +08:00 |
|
lys
|
41695c93af
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-05-21 13:43:07 +08:00 |
|
lys
|
693c436d4a
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-05-20 16:50:29 +08:00 |
|
lys
|
397c2355d8
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2503.01-业务线个税
|
2025-05-20 16:47:34 +08:00 |
|
lys
|
1a4def411e
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-05-20 16:47:22 +08:00 |
|
lys
|
07c40750da
|
release/2.19.1.2501.01
|
2025-05-19 16:04:11 +08:00 |
|
lys
|
a4c08b937b
|
release/2.19.1.2501.01
|
2025-05-13 13:53:35 +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
|
9e26192aa2
|
release/2.19.1.2501.01
|
2025-05-09 19:14:38 +08:00 |
|
lys
|
2e832e3aa9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-30 10:24:00 +08:00 |
|
lys
|
d540698c57
|
release/2.19.1.2501.01
|
2025-04-30 10:23:36 +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
|
82322ade91
|
Merge branch 'feature/2.19.1.2501.01-验证码验证' into release/3.0.1.2504.01-合并业务线
|
2025-04-25 15:58:21 +08:00 |
|
lys
|
abbf593c99
|
feature/2.19.1.2501.01-验证码验证
|
2025-04-25 15:58:01 +08:00 |
|
lys
|
0d766a1513
|
Merge branch 'feature/2.19.1.2501.01-验证码验证' into release/3.0.1.2504.01-合并业务线
|
2025-04-25 15:47:43 +08:00 |
|
lys
|
04b3415353
|
release/2.19.1.2501.01
|
2025-04-25 13:38:43 +08:00 |
|
lys
|
6201978987
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-25 09:51:41 +08:00 |
|
lys
|
e539f7b040
|
release/2.19.1.2501.01
|
2025-04-25 09:51:19 +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
|
e9d301927f
|
release/2.19.1.2501.01
|
2025-04-24 16:50:18 +08:00 |
|
lys
|
dee1059ca7
|
release/2.19.1.2501.01
|
2025-04-24 16:38:36 +08:00 |
|
lys
|
4ecde5921e
|
release/3.0.1.2504.01-合并业务线
|
2025-04-24 15:50:23 +08:00 |
|
lys
|
5c02dc876c
|
release/3.0.1.2504.01-合并业务线
|
2025-04-24 14:37:36 +08:00 |
|
lys
|
17bbeb3255
|
Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
|
2025-04-24 09:11:01 +08:00 |
|
lys
|
4d8351d627
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
|
2025-04-23 18:03:38 +08:00 |
|
lys
|
4ca0a4b756
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-23 17:41:18 +08:00 |
|
lys
|
9a50947d8a
|
release/2.19.1.2501.01
|
2025-04-23 17:34:46 +08:00 |
|
lys
|
9016fa3fe9
|
release/2.19.1.2501.01
|
2025-04-23 16:45:02 +08:00 |
|
lys
|
33a093229a
|
release/2.19.1.2501.01
|
2025-04-23 16:31:40 +08:00 |
|
lys
|
d652b2cdc6
|
release/2.19.1.2501.01
|
2025-04-23 16:13:49 +08:00 |
|
lys
|
077059fe18
|
Merge branch 'release/2.19.1.2503.01-业务线个税' into custom/钱智
|
2025-04-22 16:12:58 +08:00 |
|
lys
|
6a713ac64c
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2503.01-业务线个税
|
2025-04-22 09:38:25 +08:00 |
|
lys
|
cafe21b3fe
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-22 09:37:31 +08:00 |
|
lys
|
51ac08d6fc
|
release/2.19.1.2501.01
|
2025-04-22 09:35:04 +08:00 |
|
lys
|
eddaebc2b2
|
release/2.19.1.2503.01-业务线个税
|
2025-04-21 17:03:49 +08:00 |
|
lys
|
0e76201acc
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-04-21 14:29:04 +08:00 |
|
lys
|
1455707c9c
|
release/2.19.1.2501.01
|
2025-04-18 16:31:34 +08:00 |
|
lys
|
ec6874df2e
|
release/2.19.1.2501.01
|
2025-04-18 16:26:05 +08:00 |
|
lys
|
4b53921f03
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/calculate.js
|
2025-04-18 16:23:17 +08:00 |
|
lys
|
ae43a2aa7c
|
release/2.19.1.2501.01
|
2025-04-18 16:21:49 +08:00 |
|
lys
|
82ffd93fd5
|
5release/2.19.1.2501.01
|
2025-04-18 15:10:05 +08:00 |
|
lys
|
34b2052926
|
feature/2.19.1.2501.01-PC端Token验证
|
2025-04-18 14:49:19 +08:00 |
|
lys
|
d5bd7ae264
|
Merge branch 'release/2.19.1.2501.01' into feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 18:02:22 +08:00 |
|
lys
|
554cf4b6b3
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 17:44:30 +08:00 |
|
lys
|
6b3e321846
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 17:18:36 +08:00 |
|
lys
|
b01d280644
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 17:12:53 +08:00 |
|
lys
|
5ab71a3492
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 15:56:32 +08:00 |
|
lys
|
b3fff361ec
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 15:23:58 +08:00 |
|
lys
|
aaf00ace3c
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 15:13:40 +08:00 |
|
lys
|
d911f0bcba
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-17 14:25:10 +08:00 |
|
lys
|
94c9a39f9f
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 14:23:31 +08:00 |
|
lys
|
fab27c99ed
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-17 09:54:03 +08:00 |
|
lys
|
55ccd83916
|
feature/2.19.1.2501.01-移动端查看工资单密码设置
|
2025-04-16 16:22:51 +08:00 |
|
lys
|
854a49b018
|
release/2.19.1.2501.01
|
2025-04-16 15:51:28 +08:00 |
|
lys
|
799b086d9b
|
release/3.0.1.2504.01-合并业务线
|
2025-04-16 09:42:38 +08:00 |
|
lys
|
7677d20185
|
feature/2.19.1.2501.01-PC端Token验证
|
2025-04-15 17:33:12 +08:00 |
|
lys
|
e8684f2c58
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-15 17:30:47 +08:00 |
|
lys
|
51d9c58888
|
release/2.19.1.2501.01
|
2025-04-15 16:27:19 +08:00 |
|
lys
|
58d64b94b0
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-15 16:13:24 +08:00 |
|
lys
|
6dfb4e6650
|
release/2.19.1.2501.01
|
2025-04-15 16:13:15 +08:00 |
|
lys
|
64b32a04bd
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-04-15 15:16:47 +08:00 |
|
lys
|
38572729fd
|
release/3.0.1.2504.01-合并业务线
|
2025-04-15 15:16:29 +08:00 |
|
lys
|
142b84ca2d
|
release/3.0.1.2504.01-合并业务线
|
2025-04-15 14:51:53 +08:00 |
|
lys
|
950fa50d26
|
release/3.0.1.2504.01-合并业务线
|
2025-04-15 14:12:21 +08:00 |
|
lys
|
1cbb7ce943
|
release/3.0.1.2504.01-合并业务线
|
2025-04-15 13:49:09 +08:00 |
|
lys
|
573f2cf62d
|
release/3.0.1.2504.01-合并业务线
|
2025-04-15 09:26:52 +08:00 |
|
lys
|
80307c7b91
|
release/2.19.1.2501.01
|
2025-04-14 16:38:41 +08:00 |
|
lys
|
a81cc3b1cb
|
Merge branch 'release/3.0.1.2503.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-04-08 16:40:03 +08:00 |
|
lys
|
4059e8364e
|
release/3.0.1.2503.01-合并业务线
|
2025-04-02 16:16:38 +08:00 |
|
lys
|
4df7696f01
|
release/3.0.1.2503.01-合并业务线
|
2025-04-02 10:50:19 +08:00 |
|
lys
|
122005be2b
|
release/3.0.1.2503.01-合并业务线
|
2025-04-01 17:46:38 +08:00 |
|
lys
|
8bb09affaa
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-04-01 15:07:50 +08:00 |
|
lys
|
1bbaa93c69
|
Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
|
2025-04-01 15:07:29 +08:00 |
|
lys
|
867a0dc58c
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-04-01 15:07:05 +08:00 |
|
lys
|
3b2a987778
|
release/2.19.1.2501.01
|
2025-04-01 15:05:59 +08:00 |
|
lys
|
925bc0f75a
|
release/2.19.1.2501.01
|
2025-04-01 15:05:39 +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
|
cfe8117bbf
|
release/2.19.1.2501.01-个税
|
2025-04-01 11:28:41 +08:00 |
|
lys
|
41a6afdb40
|
release/2.19.1.2501.01-个税
|
2025-03-31 16:11:37 +08:00 |
|
lys
|
fe4985fa9b
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-27 15:33:10 +08:00 |
|
lys
|
ae35d29e36
|
Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
|
2025-03-27 15:30:43 +08:00 |
|
lys
|
20da3fd4eb
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-27 15:30:16 +08:00 |
|
lys
|
bb3ded5692
|
release/2.19.1.2501.01
|
2025-03-27 15:28:53 +08:00 |
|
lys
|
c3284fa160
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-27 13:51:01 +08:00 |
|
lys
|
2e818defdb
|
Merge branch 'release/3.0.1.2503.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-03-27 13:50:25 +08:00 |
|
lys
|
10b45fdfb9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
|
2025-03-27 13:50:03 +08:00 |