 李鹏宇
|
f7b3d0b1ad
|
!373 zhou
Merge pull request !373 from 李鹏宇/dev
|
2024-11-03 08:20:14 +00:00 |
|
|
李鹏宇
|
563aa3b569
|
pengyuthon
|
2024-11-03 16:18:12 +08:00 |
|
|
李鹏宇
|
c4d7ea3148
|
!372 zhou
Merge pull request !372 from 李鹏宇/dev_zhou
|
2024-11-03 08:17:16 +00:00 |
|
|
李鹏宇
|
7b332a4b24
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhou
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
|
2024-11-03 08:17:00 +00:00 |
|
|
李鹏宇
|
e0a8c24e27
|
!371 pengyuthon
Merge pull request !371 from 李鹏宇/dev
|
2024-11-03 08:10:06 +00:00 |
|
|
李鹏宇
|
517dfa937e
|
pengyuthon
|
2024-11-03 16:08:56 +08:00 |
|
|
李鹏宇
|
b7b550b759
|
pengyuthon
|
2024-11-03 16:01:58 +08:00 |
|
|
zhouzhou
|
3e9f108e7b
|
添加功能
|
2024-11-01 20:20:20 +08:00 |
|
|
zhouzhou
|
4bcd85b4a1
|
添加功能
|
2024-11-01 20:08:13 +08:00 |
|
|
zhouzhou
|
424405f740
|
添加功能
|
2024-11-01 16:36:44 +08:00 |
|
|
zhouzhou
|
910e97930b
|
Merge remote-tracking branch 'origin/dev' into dev_zhou
|
2024-11-01 11:53:18 +08:00 |
|
|
zhouzhou
|
ed27274d6d
|
添加功能
|
2024-11-01 11:51:32 +08:00 |
|
|
李鹏宇
|
35f2b2464e
|
!368 zhou
Merge pull request !368 from 李鹏宇/dev_zhou
|
2024-10-31 13:55:35 +00:00 |
|
|
zhouzhou
|
82400ee97b
|
添加功能
|
2024-10-31 21:54:24 +08:00 |
|
|
李鹏宇
|
11961a530e
|
!367 zhou
Merge pull request !367 from 李鹏宇/dev_zhou
|
2024-10-31 12:39:50 +00:00 |
|
|
李鹏宇
|
990daf730c
|
pengyuthon
|
2024-10-31 20:35:38 +08:00 |
|
|
zhouzhou
|
e5772499a5
|
Merge remote-tracking branch 'origin/dev' into dev_zhou
# Conflicts:
# yuthon_holiday/models/inherit_hr_leave.py
# yuthon_holiday/models/inherit_hr_leave_type.py
# yuthon_holiday/views/inherit_hr_type_views.xml
|
2024-10-31 20:19:44 +08:00 |
|
|
李鹏宇
|
f82537b823
|
!364 pengyuthon
Merge pull request !364 from 李鹏宇/dev
|
2024-10-31 12:14:59 +00:00 |
|
|
李鹏宇
|
d3c0f84ee8
|
pengyuthon
|
2024-10-31 12:13:57 +00:00 |
|
|
李鹏宇
|
b835353ca8
|
pengyuthon
|
2024-10-31 12:13:57 +00:00 |
|
|
李鹏宇
|
517307cb08
|
pengyuthon
|
2024-10-31 12:13:57 +00:00 |
|
|
李鹏宇
|
283330cfe4
|
pengyuthon
|
2024-10-31 20:12:01 +08:00 |
|
|
zhouzhou
|
44dd7fff59
|
添加功能
|
2024-10-31 19:54:26 +08:00 |
|
|
zhouzhou
|
97788349d0
|
Merge branch 'refs/heads/dev' into dev_zhou
|
2024-10-31 18:29:52 +08:00 |
|
|
李鹏宇
|
85cf8eecae
|
pengyuthon
|
2024-10-31 18:24:02 +08:00 |
|
|
zhouzhou
|
6765f80f90
|
Merge branch 'refs/heads/dev' into dev_zhou
|
2024-10-30 18:48:21 +08:00 |
|
|
李鹏宇
|
2c589e5668
|
pengyuthon
|
2024-10-30 18:43:41 +08:00 |
|
|
李鹏宇
|
1f1c3077d0
|
!363 zhou
Merge pull request !363 from 李鹏宇/dev
|
2024-10-30 06:53:06 +00:00 |
|
|
李鹏宇
|
e4a967c98f
|
!362 zhou
Merge pull request !362 from 李鹏宇/dev_zhou
|
2024-10-30 06:52:17 +00:00 |
|
|
zhouzhou
|
103888b48c
|
添加功能
|
2024-10-30 14:50:49 +08:00 |
|
|
zhouzhou
|
ae3aac70e0
|
Merge branch 'refs/heads/dev' into dev_zhou
|
2024-10-30 14:50:00 +08:00 |
|
|
ljm
|
0759e7db1e
|
!361 员工信息
Merge pull request !361 from dev_ljm_20241027
|
2024-10-29 13:17:17 +00:00 |
|
|
李鹏宇
|
238a08a370
|
pengyuthon
|
2024-10-29 21:16:14 +08:00 |
|
|
梁健明
|
846ea0fc60
|
员工信息
|
2024-10-29 21:14:59 +08:00 |
|
|
李鹏宇
|
f650024ce2
|
!360 zhou
Merge pull request !360 from 李鹏宇/dev
|
2024-10-29 06:54:33 +00:00 |
|
|
zhouzhou
|
2ad76c2ed1
|
Merge branch 'refs/heads/dev' into dev_zhou
|
2024-10-29 14:43:37 +08:00 |
|
|
李鹏宇
|
d6faa5c848
|
pengyuthon
|
2024-10-29 14:43:15 +08:00 |
|
|
李鹏宇
|
c22dc95166
|
!359 pengyuthon
Merge pull request !359 from 李鹏宇/dev
|
2024-10-29 06:27:59 +00:00 |
|
|
李鹏宇
|
32d9a5fa84
|
!358 zhou
Merge pull request !358 from 李鹏宇/dev_zhou
|
2024-10-29 06:26:43 +00:00 |
|
|
李鹏宇
|
040f3ed24b
|
pengyuthon
|
2024-10-29 06:26:10 +00:00 |
|
|
zhouzhou
|
e7ba4f5247
|
添加功能
|
2024-10-29 06:24:45 +00:00 |
|
|
zhouzhou
|
0b3c7f0f88
|
添加功能
|
2024-10-29 10:47:02 +08:00 |
|
|
李鹏宇
|
8731cc082d
|
!356 zhou
Merge pull request !356 from 李鹏宇/dev
|
2024-10-29 02:41:05 +00:00 |
|
|
李鹏宇
|
5a9c8c79fc
|
!355 zhou
Merge pull request !355 from 李鹏宇/dev_zhou
|
2024-10-29 02:40:16 +00:00 |
|
|
zhouzhou
|
a7e26d6879
|
Merge branch 'refs/heads/dev' into dev_zhou
|
2024-10-29 10:39:17 +08:00 |
|
|
zhouzhou
|
c4f99129c0
|
添加功能
|
2024-10-29 10:37:29 +08:00 |
|
|
ljm
|
e9c1e73984
|
!354 合并
Merge pull request !354 from dev_ljm_20241027
|
2024-10-29 02:06:56 +00:00 |
|
|
李鹏宇
|
a614369e35
|
!353 zhou
Merge pull request !353 from 李鹏宇/dev
|
2024-10-28 14:42:35 +00:00 |
|
|
李鹏宇
|
482b7cb0cd
|
!352 zhou
Merge pull request !352 from 李鹏宇/dev_zhou
|
2024-10-28 14:41:57 +00:00 |
|
|
zhouzhou
|
a45e1deceb
|
添加功能
|
2024-10-28 22:40:35 +08:00 |
|