Commit Graph
17471 Commits
Author SHA1 Message Date
李鹏宇 95cd3cf68b 添加功能 2026-03-12 14:55:47 +08:00
李鹏宇 cac7c1e98e !9633 !9632 添加功能
Merge pull request !9633 from 李鹏宇/dev
2026-03-12 04:03:14 +00:00
李鹏宇 263a848805 !9632 添加功能
Merge pull request !9632 from 李鹏宇/dev_zhou
2026-03-12 04:02:56 +00:00
李鹏宇 0042be5212 添加功能 2026-03-12 12:02:34 +08:00
李鹏宇 fcc21bd18a !9631 !9630 添加功能
Merge pull request !9631 from 李鹏宇/dev
2026-03-12 03:35:48 +00:00
李鹏宇 adf735bd6b !9630 添加功能
Merge pull request !9630 from 李鹏宇/dev_zhou
2026-03-12 03:35:14 +00:00
李鹏宇 d4303d74b2 添加功能 2026-03-12 11:33:05 +08:00
李鹏宇 31667570b5 !9629 !9628 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9629 from 李鹏宇/dev
2026-03-12 03:32:46 +00:00
李鹏宇 520aed164c !9628 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 !9628 from 李鹏宇/dev_wang
2026-03-12 03:32:23 +00:00
李鹏宇 e0cb0c0606 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-12 11:31:43 +08:00
李鹏宇 9f21e0620e 公章证照调用呈批 2026-03-12 11:31:30 +08:00
李鹏宇 cc1fec8350 !9627 !9626 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9627 from 李鹏宇/dev
2026-03-12 03:23:57 +00:00
李鹏宇 04f46d6f5e !9625 !9624 添加功能
Merge pull request !9625 from 李鹏宇/dev
2026-03-12 03:23:31 +00:00
李鹏宇 96e3305a5f !9626 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 !9626 from 李鹏宇/dev_wang
2026-03-12 03:23:08 +00:00
李鹏宇 55bc21c74a Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-12 11:22:25 +08:00
李鹏宇 0a97b1e4a5 公章证照调用呈批 2026-03-12 11:22:12 +08:00
李鹏宇 2175816b8d !9624 添加功能
Merge pull request !9624 from 李鹏宇/dev_zhou
2026-03-12 03:19:31 +00:00
李鹏宇 dc785c7c5d 添加功能 2026-03-12 11:15:37 +08:00
李鹏宇 ca8c173a32 !9623 !9622 添加功能
Merge pull request !9623 from 李鹏宇/dev
2026-03-12 02:44:16 +00:00
李鹏宇 ddef23e944 !9622 添加功能
Merge pull request !9622 from 李鹏宇/dev_zhou
2026-03-12 02:43:58 +00:00
李鹏宇 5d19d6ca66 添加功能 2026-03-12 10:43:10 +08:00
李鹏宇 be4f1868f9 !9621 !9620 添加功能
Merge pull request !9621 from 李鹏宇/dev
2026-03-12 02:07:14 +00:00
李鹏宇 4d341f0e12 !9620 添加功能
Merge pull request !9620 from 李鹏宇/dev_zhou
2026-03-12 02:06:52 +00:00
李鹏宇 4225af0cbb 添加功能 2026-03-12 10:06:03 +08:00
李鹏宇 5087b38147 !9619 !9618 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9619 from 李鹏宇/dev
2026-03-12 02:05:35 +00:00
李鹏宇 3ac489994e !9618 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 !9618 from 李鹏宇/dev_wang
2026-03-12 02:04:59 +00:00
李鹏宇 79ca2490e9 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-12 10:00:54 +08:00
李鹏宇 961ad8ec94 日程取消不显示,党(总)支收发文 2026-03-12 10:00:19 +08:00
李鹏宇 baa8fdfba5 !9617 bug
Merge pull request !9617 from 李鹏宇/dev
2026-03-11 15:49:53 +00:00
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
李鹏宇 f697d07fd5 !9616 !9615 Merge branch 'master' into dev_zhou
Merge pull request !9616 from 李鹏宇/dev
2026-03-11 12:42:19 +00: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 &lt;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 &lt;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