 lys
|
c765d95892
|
Merge branch 'feature/2.19.1.2501.01-考勤数据编辑' into custom/西部信托0401
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
# pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
|
2025-06-12 17:03:15 +08:00 |
|
lys
|
ce19b4b888
|
feature/2.19.1.2501.01-考勤数据编辑
|
2025-06-12 16:56:24 +08:00 |
|
lys
|
fb46f0b336
|
feature/2.19.1.2501.01-考勤数据编辑
|
2025-06-12 16:29:57 +08:00 |
|
lys
|
2f493bf666
|
Merge branch 'feature/2.19.1.2501.01-考勤数据编辑' into custom/西部信托0401
|
2025-06-12 13:49:46 +08:00 |
|
lys
|
ad71152e38
|
Merge branch 'feature/2.19.1.2501.01-个税申报表编辑功能' into custom/西部信托0401
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js
|
2025-06-12 13:49:35 +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
|
89c3231871
|
feature/2.19.1.2501.01-薪酬批量操作
|
2025-06-11 10:32:52 +08:00 |
|
lys
|
12947067c0
|
feature/2.19.1.2501.01-薪酬批量操作
|
2025-06-11 10:10:52 +08:00 |
|
lys
|
143490c6d1
|
feature/2.19.1.2501.01-薪酬批量操作
|
2025-06-11 10:01:38 +08:00 |
|
lys
|
326e4bffa5
|
feature/2.19.1.2501.01-薪酬批量操作
|
2025-06-11 09:53:03 +08:00 |
|
lys
|
2920d5892a
|
feature/2.19.1.2501.01-考勤数据编辑
|
2025-06-03 18:26:31 +08:00 |
|
lys
|
d58890beed
|
feature/2.19.1.2501.01-考勤数据编辑
|
2025-06-03 18:14:36 +08:00 |
|
lys
|
2b639ad388
|
custom/五院杭州中心
|
2025-05-27 12:31:43 +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
|
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
|
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
|
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
|
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
|
d652b2cdc6
|
release/2.19.1.2501.01
|
2025-04-23 16:13:49 +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
|
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 |