 pengyuthon
|
86c02cf67e
|
bug
|
2026-03-11 23:47:34 +08:00 |
|
|
pengyuthon
|
445fcd33df
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# yuthon_catering/models/yuthon_catering.py
# yuthon_catering/views/yuthon_catering.xml
|
2026-03-11 22:03:07 +08:00 |
|
|
李鹏宇
|
c8a95b0f57
|
!9615 Merge branch 'master' into dev_zhou
Merge pull request !9615 from 李鹏宇/dev_zhou
|
2026-03-11 12:42:02 +00:00 |
|
|
李鹏宇
|
d7a981a4b7
|
Merge branch 'master' into dev_zhou
# Conflicts:
# yuthon_will_task/models/inherit_room_booking.py
|
2026-03-11 20:41:27 +08:00 |
|
|
李鹏宇
|
0a8095c2d2
|
!9614 !9613 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9614 from 李鹏宇/dev
|
2026-03-11 12:36:50 +00:00 |
|
|
李鹏宇
|
7a9ef49a4c
|
!9613 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9613 from 李鹏宇/dev_wang
|
2026-03-11 12:36:25 +00:00 |
|
|
李鹏宇
|
a8e28636cd
|
添加功能
|
2026-03-11 20:36:07 +08:00 |
|
|
李鹏宇
|
19512ea30c
|
添加功能
|
2026-03-11 20:33:47 +08:00 |
|
|
李鹏宇
|
32669a911f
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang
|
2026-03-11 20:33:07 +08:00 |
|
|
李鹏宇
|
00fac292a7
|
手动按钮
|
2026-03-11 20:31:47 +08:00 |
|
|
李鹏宇
|
133fe91f98
|
!9612 !9611 添加功能
Merge pull request !9612 from 李鹏宇/dev
|
2026-03-11 12:26:05 +00:00 |
|
|
李鹏宇
|
56cc977fc6
|
!9611 添加功能
Merge pull request !9611 from 李鹏宇/dev_zhou
|
2026-03-11 12:25:46 +00:00 |
|
|
李鹏宇
|
eec19b68e8
|
添加功能
|
2026-03-11 20:25:20 +08:00 |
|
|
李鹏宇
|
96e9c96d34
|
!9610 !9609 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9610 from 李鹏宇/dev
|
2026-03-11 12:17:10 +00:00 |
|
|
李鹏宇
|
c9284f8efb
|
!9609 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9609 from 李鹏宇/dev_wang
|
2026-03-11 12:16:46 +00:00 |
|
|
李鹏宇
|
ac49dc1f85
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang
|
2026-03-11 20:15:57 +08:00 |
|
|
李鹏宇
|
d47682b174
|
按钮，提醒
|
2026-03-11 20:15:45 +08:00 |
|
|
李鹏宇
|
fc60d2c4f8
|
!9608 !9607 添加功能
Merge pull request !9608 from 李鹏宇/dev
|
2026-03-11 11:50:38 +00:00 |
|
|
李鹏宇
|
2880907bb3
|
!9607 添加功能
Merge pull request !9607 from 李鹏宇/dev_zhou
|
2026-03-11 11:50:04 +00:00 |
|
|
李鹏宇
|
e5deb55431
|
添加功能
|
2026-03-11 19:49:34 +08:00 |
|
|
李鹏宇
|
d58c99e5e5
|
!9606 !9605 添加功能
Merge pull request !9606 from 李鹏宇/dev
|
2026-03-11 11:47:26 +00:00 |
|
|
李鹏宇
|
6583a651d4
|
!9605 添加功能
Merge pull request !9605 from 李鹏宇/dev_zhou
|
2026-03-11 11:47:02 +00:00 |
|
|
李鹏宇
|
50d6af61fb
|
添加功能
|
2026-03-11 19:46:37 +08:00 |
|
|
李鹏宇
|
420e8af23b
|
!9604 !9603 添加功能
Merge pull request !9604 from 李鹏宇/dev
|
2026-03-11 11:41:30 +00:00 |
|
|
李鹏宇
|
0fd1a55331
|
!9603 添加功能
Merge pull request !9603 from 李鹏宇/dev_zhou
|
2026-03-11 11:41:13 +00:00 |
|
|
李鹏宇
|
d881d70f4c
|
添加功能
|
2026-03-11 19:38:32 +08:00 |
|
|
李鹏宇
|
052030165a
|
!9602 !9601 日程
Merge pull request !9602 from 李鹏宇/dev
|
2026-03-11 11:22:26 +00:00 |
|
|
李鹏宇
|
3acf44a697
|
!9601 日程
Merge pull request !9601 from 李鹏宇/dev_wang
|
2026-03-11 11:22:05 +00:00 |
|
|
李鹏宇
|
9fba75cbd1
|
日程
|
2026-03-11 19:18:38 +08:00 |
|
|
pengyuthon
|
67964e74bc
|
花名册
|
2026-03-11 19:09:54 +08:00 |
|
|
李鹏宇
|
1fe41b120b
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang
|
2026-03-11 18:53:27 +08:00 |
|
|
李鹏宇
|
5696dae2fb
|
日程
|
2026-03-11 18:53:08 +08:00 |
|
|
李鹏宇
|
ebd087a26c
|
日程
|
2026-03-11 18:50:00 +08:00 |
|
|
李鹏宇
|
eef5302303
|
!9600 !9599 添加功能
Merge pull request !9600 from 李鹏宇/dev
|
2026-03-11 10:43:40 +00:00 |
|
|
李鹏宇
|
77502c0273
|
!9599 添加功能
Merge pull request !9599 from 李鹏宇/dev_zhou
|
2026-03-11 10:43:14 +00:00 |
|
|
李鹏宇
|
bf3dd98aa6
|
添加功能
|
2026-03-11 18:42:18 +08:00 |
|
|
李鹏宇
|
fed9cc1191
|
!9598 !9597 添加功能
Merge pull request !9598 from 李鹏宇/dev
|
2026-03-11 10:22:33 +00:00 |
|
|
李鹏宇
|
53af284558
|
!9597 添加功能
Merge pull request !9597 from 李鹏宇/dev_zhou
|
2026-03-11 10:22:10 +00:00 |
|
|
李鹏宇
|
c8bcc2f513
|
添加功能
|
2026-03-11 18:20:55 +08:00 |
|
|
李鹏宇
|
031858482f
|
!9596 !9595 添加功能
Merge pull request !9596 from 李鹏宇/dev
|
2026-03-11 10:11:08 +00:00 |
|
|
李鹏宇
|
d23a184e11
|
!9595 添加功能
Merge pull request !9595 from 李鹏宇/dev_zhou
|
2026-03-11 10:10:49 +00:00 |
|
|
李鹏宇
|
cf6fd7f35f
|
添加功能
|
2026-03-11 18:09:00 +08:00 |
|
|
李鹏宇
|
9a6147b68d
|
!9594 !9593 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9594 from 李鹏宇/dev
|
2026-03-11 09:46:01 +00:00 |
|
|
李鹏宇
|
698d57d8e9
|
!9593 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !9593 from 李鹏宇/dev_wang
|
2026-03-11 09:45:34 +00:00 |
|
|
李鹏宇
|
892e182c27
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang
|
2026-03-11 17:44:59 +08:00 |
|
|
李鹏宇
|
c31b0eb6d6
|
日程
|
2026-03-11 17:44:43 +08:00 |
|
|
李鹏宇
|
ef8a4a8bb3
|
!9592 !9591 添加功能
Merge pull request !9592 from 李鹏宇/dev
|
2026-03-11 09:38:29 +00:00 |
|
|
李鹏宇
|
c46dd9a763
|
!9591 添加功能
Merge pull request !9591 from 李鹏宇/dev_zhou
|
2026-03-11 09:38:12 +00:00 |
|
|
李鹏宇
|
237eaf9367
|
添加功能
|
2026-03-11 17:37:28 +08:00 |
|
|
李鹏宇
|
32be793dd5
|
!9590 !9589 添加功能
Merge pull request !9590 from dev
|
2026-03-11 09:04:02 +00:00 |
|