 李鹏宇
|
b5c883e1e0
|
!419 zhou
Merge pull request !419 from 李鹏宇/dev_zhou
|
2024-11-11 08:36:51 +00:00 |
|
|
zhouzhou
|
2a36bdd498
|
添加功能
|
2024-11-11 16:32:43 +08:00 |
|
|
李鹏宇
|
0531f0852e
|
pengyuthon wechat
|
2024-11-11 14:20:35 +08:00 |
|
|
李鹏宇
|
b6898c4cb7
|
pengyuthon wechat
|
2024-11-11 14:06:28 +08:00 |
|
|
李鹏宇
|
1794ba1f69
|
!416 zhou
Merge pull request !416 from 李鹏宇/dev_zhou
|
2024-11-11 03:56:27 +00:00 |
|
|
zhouzhou
|
9e5944a530
|
添加功能
|
2024-11-11 11:54:01 +08:00 |
|
|
zhouzhou
|
3a146f50df
|
Merge branch 'refs/heads/dev' into dev_zhou
# Conflicts:
# yuthon_holiday/views/inherit_hr_leave_allocation_views.xml
|
2024-11-10 20:32:47 +08:00 |
|
|
李鹏宇
|
6262e79e8b
|
pengyuthon wechat
|
2024-11-10 20:20:07 +08:00 |
|
|
李鹏宇
|
02b39c3bab
|
!414 pengyuthon
Merge pull request !414 from 李鹏宇/dev_zhou
|
2024-11-10 10:11:05 +00:00 |
|
|
李鹏宇
|
d76a8a2b72
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhou
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
|
2024-11-10 10:10:49 +00:00 |
|
|
zhouzhou
|
ae4e2bfb4b
|
添加功能
|
2024-11-10 10:09:22 +00:00 |
|
|
zhouzhou
|
40d0f66c92
|
添加功能
|
2024-11-10 10:09:22 +00:00 |
|
|
李鹏宇
|
124d6134ff
|
pengyuthon wechat
|
2024-11-10 16:48:34 +08:00 |
|
|
zhouzhou
|
42bc325285
|
添加功能
|
2024-11-09 18:09:43 +08:00 |
|
|
李鹏宇
|
926d440898
|
!412 zhou
Merge pull request !412 from 李鹏宇/dev_zhou
|
2024-11-09 09:42:56 +00:00 |
|
|
zhouzhou
|
40bc711090
|
添加功能
|
2024-11-09 17:42:01 +08:00 |
|
|
李鹏宇
|
1ca4c3ce32
|
!411 zhou
Merge pull request !411 from 李鹏宇/dev
|
2024-11-09 08:32:37 +00:00 |
|
|
李鹏宇
|
04a28f2cd9
|
!410 zhou
Merge pull request !410 from 李鹏宇/dev_zhou
|
2024-11-09 08:30:22 +00:00 |
|
|
zhouzhou
|
f2eeb8cf9b
|
添加功能
|
2024-11-09 16:29:35 +08:00 |
|
|
李鹏宇
|
3169b8ebfc
|
pengyuthon
|
2024-11-09 16:18:46 +08:00 |
|
|
李鹏宇
|
e15fee4215
|
!409 zhou
Merge pull request !409 from 李鹏宇/dev
|
2024-11-09 08:17:09 +00:00 |
|
|
李鹏宇
|
82838f342c
|
pengyuthon
|
2024-11-09 16:15:11 +08:00 |
|
|
李鹏宇
|
d718f9d96f
|
!408 zhou
Merge pull request !408 from 李鹏宇/dev_zhou
|
2024-11-09 08:11:40 +00:00 |
|
|
zhouzhou
|
5d6f332c07
|
添加功能
|
2024-11-09 16:10:17 +08:00 |
|
|
李鹏宇
|
73de419deb
|
!407 zhou
Merge pull request !407 from 李鹏宇/dev
|
2024-11-08 13:22:18 +00:00 |
|
|
李鹏宇
|
76ad1ca431
|
pengyuthon
|
2024-11-08 21:16:59 +08:00 |
|
|
李鹏宇
|
e0d8de5740
|
!406 zhou
Merge pull request !406 from 李鹏宇/dev_zhou
|
2024-11-08 13:12:44 +00:00 |
|
|
zhouzhou
|
d050c32f68
|
添加功能
|
2024-11-08 21:11:29 +08:00 |
|
|
李鹏宇
|
d55f338601
|
pengyuthon
|
2024-11-08 18:50:00 +08:00 |
|
|
李鹏宇
|
14ba912ec0
|
!405 zhou
Merge pull request !405 from 李鹏宇/dev_zhou
|
2024-11-08 10:38:37 +00:00 |
|
|
zhouzhou
|
99635b33d0
|
添加功能
|
2024-11-08 18:37:22 +08:00 |
|
|
李鹏宇
|
1e4e975a57
|
!404 zhou
Merge pull request !404 from 李鹏宇/dev_zhou
|
2024-11-08 08:34:12 +00:00 |
|
|
zhouzhou
|
56dd8a8d5f
|
添加功能
|
2024-11-08 16:33:31 +08:00 |
|
|
李鹏宇
|
eaf7b013f0
|
!403 zhou
Merge pull request !403 from 李鹏宇/dev_zhou
|
2024-11-08 08:22:16 +00:00 |
|
|
zhouzhou
|
3c1a4d4333
|
Merge branch 'dev' into dev_zhou
|
2024-11-08 16:20:53 +08:00 |
|
|
zhouzhou
|
9519a92b82
|
添加功能
|
2024-11-08 16:19:44 +08:00 |
|
|
李鹏宇
|
6e1a10dc0e
|
!402 zhou
Merge pull request !402 from 李鹏宇/dev
|
2024-11-07 12:51:31 +00:00 |
|
|
李鹏宇
|
51c7f88c1b
|
!401 zhou
Merge pull request !401 from 李鹏宇/dev_zhou
|
2024-11-07 12:50:53 +00:00 |
|
|
zhouzhou
|
b2a664445c
|
Merge branch 'dev' into dev_zhou
# Conflicts:
# yuthon_hr_employee_approval/controllers/employee_login.py
|
2024-11-07 20:49:33 +08:00 |
|
|
zhouzhou
|
0f63fcf4ea
|
添加功能
|
2024-11-07 20:48:33 +08:00 |
|
|
李鹏宇
|
53fff2f7ed
|
!400 zhou
Merge pull request !400 from 李鹏宇/dev
|
2024-11-07 12:41:19 +00:00 |
|
|
李鹏宇
|
7b2441cc24
|
!399 zhou
Merge pull request !399 from 李鹏宇/dev_zhou
|
2024-11-07 12:40:45 +00:00 |
|
|
zhouzhou
|
14da90effe
|
添加功能
|
2024-11-07 12:40:13 +00:00 |
|
|
zhouzhou
|
6957f4b8e3
|
添加功能
|
2024-11-07 20:39:00 +08:00 |
|
|
李鹏宇
|
b3a50cc32f
|
!398 zhou
Merge pull request !398 from 李鹏宇/dev
|
2024-11-07 12:10:04 +00:00 |
|
|
李鹏宇
|
5be5de7ca2
|
!397 zhou
Merge pull request !397 from 李鹏宇/dev_zhou
|
2024-11-07 12:09:33 +00:00 |
|
|
zhouzhou
|
28e110f471
|
添加功能
|
2024-11-07 20:08:38 +08:00 |
|
|
李鹏宇
|
38419bb6bc
|
pengyuthon
|
2024-11-07 19:03:19 +08:00 |
|
|
zhouzhou
|
52800eb5b2
|
Merge branch 'dev' into dev_zhou
|
2024-11-07 17:05:04 +08:00 |
|
|
李鹏宇
|
a5ec424bba
|
pengyuthon
|
2024-11-07 17:04:44 +08:00 |
|