 lys
|
8c3c4ee520
|
custom/西部信托0401
|
2025-11-11 17:14:14 +08:00 |
|
lys
|
c773ffe6ed
|
custom/西部信托0401
|
2025-10-11 15:53:31 +08:00 |
|
lys
|
7827c32fde
|
custom/西部信托0401
|
2025-09-04 09:56:54 +08:00 |
|
lys
|
c5781db19a
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into custom/西部信托0401
|
2025-09-02 15:05:12 +08:00 |
|
lys
|
000e8acdaf
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-09-02 15:04:34 +08:00 |
|
lys
|
5ef2c5ecb4
|
release/2.19.1.2501.01
|
2025-09-02 14:52:58 +08:00 |
|
lys
|
20d0fdfa0d
|
Merge branch 'release/3.0.1.2504.01-合并业务线' into custom/西部信托0401
|
2025-08-29 11:06:22 +08:00 |
|
lys
|
5da8661bbd
|
0release/3.0.1.2504.01-合并业务线
|
2025-08-26 14:25:26 +08:00 |
|
lys
|
5f80e9e6b3
|
release/2.19.1.2501.01
|
2025-08-04 16:29:06 +08:00 |
|
lys
|
2b39980ed0
|
release/2.19.1.2501.01
|
2025-08-04 16:24:41 +08:00 |
|
lys
|
2321266533
|
release/2.19.1.2501.01
|
2025-08-04 16:23:10 +08:00 |
|
lys
|
32162c9cba
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-07-24 16:54:25 +08:00 |
|
lys
|
3d8b242889
|
release/2.19.1.2501.01
|
2025-07-24 16:51:19 +08:00 |
|
lys
|
9121309221
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线
|
2025-07-24 16:45:23 +08:00 |
|
lys
|
2871043810
|
release/2.19.1.2501.01
|
2025-07-17 17:28:48 +08:00 |
|
lys
|
f3e2d878d0
|
release/3.0.1.2504.01-合并业务线
|
2025-07-08 10:18:34 +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
|
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
|
ab1502b0fd
|
Merge branch 'feature/2.19.1.2501.01-考勤数据编辑' into custom/西部信托0401
|
2025-06-12 17:21:31 +08:00 |
|
lys
|
e0ad7558fb
|
feature/2.19.1.2501.01-考勤数据编辑
|
2025-06-12 17:21:22 +08:00 |
|
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 |