Commit Graph
100 Commits
Author SHA1 Message Date
李鹏宇 6fad1c7ee4 报表 2026-03-12 19:19:46 +08:00
李鹏宇 02173d23ca Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-12 19:06:10 +08:00
李鹏宇 eacb75f802 报表 2026-03-12 19:05:56 +08:00
李鹏宇 01ef3921b4 !9652 添加功能
Merge pull request !9652 from 李鹏宇/dev_zhou
2026-03-12 10:36:22 +00:00
李鹏宇 e701f717f9 !9650 添加功能
Merge pull request !9650 from 李鹏宇/dev_zhou
2026-03-12 10:22:27 +00:00
李鹏宇 03a2057352 !9648 添加功能
Merge pull request !9648 from 李鹏宇/dev_zhou
2026-03-12 10:19:54 +00:00
李鹏宇 c66da03284 !9646 添加功能
Merge pull request !9646 from 李鹏宇/dev_zhou
2026-03-12 09:45:47 +00:00
李鹏宇 538ed42848 !9644 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 !9644 from 李鹏宇/dev_wang
2026-03-12 08:44:05 +00:00
李鹏宇 e8d79ae3b0 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-12 16:43:15 +08:00
李鹏宇 fa08276606 按钮 2026-03-12 16:43:03 +08:00
李鹏宇 ae7f7ada84 !9642 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 !9642 from 李鹏宇/dev_wang
2026-03-12 08:28:25 +00:00
李鹏宇 2eab0b4dd1 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-12 16:26:03 +08:00
李鹏宇 3ec26b27c1 按钮,租赁变更审批打印 2026-03-12 16:25:50 +08:00
李鹏宇 78e9d4f3e7 !9640 添加功能
Merge pull request !9640 from 李鹏宇/dev_zhou
2026-03-12 07:38:41 +00:00
李鹏宇 8653ec9c36 !9638 添加功能
Merge pull request !9638 from 李鹏宇/dev_zhou
2026-03-12 07:34:19 +00:00
李鹏宇 917fa3ecc9 !9636 添加功能
Merge pull request !9636 from 李鹏宇/dev_zhou
2026-03-12 07:13:24 +00:00
李鹏宇 5fb49be6cb !9634 添加功能
Merge pull request !9634 from 李鹏宇/dev_zhou
2026-03-12 06:57:51 +00:00
李鹏宇 263a848805 !9632 添加功能
Merge pull request !9632 from 李鹏宇/dev_zhou
2026-03-12 04:02:56 +00:00
李鹏宇 adf735bd6b !9630 添加功能
Merge pull request !9630 from 李鹏宇/dev_zhou
2026-03-12 03:35:14 +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
李鹏宇 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
李鹏宇 ddef23e944 !9622 添加功能
Merge pull request !9622 from 李鹏宇/dev_zhou
2026-03-12 02:43:58 +00: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
李鹏宇 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
李鹏宇 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
李鹏宇 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
李鹏宇 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
李鹏宇 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
李鹏宇 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
李鹏宇 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
李鹏宇 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
李鹏宇 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
李鹏宇 9a6147b68d !9594 !9593 Merge branch 'dev' of &lt;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
李鹏宇 32be793dd5 !9590 !9589 添加功能
Merge pull request !9590 from dev
2026-03-11 09:04:02 +00:00
李鹏宇 1cb0a0be96 !9589 添加功能
Merge pull request !9589 from 李鹏宇/dev_zhou
2026-03-11 09:03:38 +00:00
李鹏宇 634fc4da45 !9588 !9587 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9588 from 李鹏宇/dev
2026-03-11 08:40:08 +00:00
李鹏宇 1aa5af5120 !9587 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 !9587 from 李鹏宇/dev_wang
2026-03-11 08:39:29 +00:00
李鹏宇 a395fc1148 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-11 16:38:27 +08:00
李鹏宇 aa6edaaff8 删掉排序 2026-03-11 16:38:15 +08:00
李鹏宇 9a51837cf4 !9586 !9585 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9586 from 李鹏宇/dev
2026-03-11 08:04:43 +00:00
李鹏宇 2d29a3a58e !9585 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 !9585 from 李鹏宇/dev_wang
2026-03-11 08:04:23 +00:00
李鹏宇 69d194aaac Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-11 16:03:17 +08:00
李鹏宇 6db165a809 党支委 2026-03-11 16:03:06 +08:00
李鹏宇 a9f7d043a2 !9584 !9583 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9584 from 李鹏宇/dev
2026-03-11 07:48:31 +00:00
李鹏宇 14ae609343 !9583 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 !9583 from 李鹏宇/dev_wang
2026-03-11 07:48:08 +00:00
李鹏宇 3a8ac29ffb Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-11 15:47:27 +08:00
李鹏宇 dcb4956622 党支委 2026-03-11 15:47:14 +08:00
李鹏宇 57495490cb !9582 !9581 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9582 from 李鹏宇/dev
2026-03-11 07:13:59 +00:00
李鹏宇 699d4875b4 !9581 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 !9581 from 李鹏宇/dev_wang
2026-03-11 07:13:37 +00:00
李鹏宇 30d797e1f7 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-11 15:12:47 +08:00
李鹏宇 424dda37d9 公开招租审批 2026-03-11 15:12:36 +08:00
李鹏宇 684a3ab020 !9580 !9579 添加功能
Merge pull request !9580 from 李鹏宇/dev
2026-03-11 06:47:45 +00:00
李鹏宇 fc7014a001 !9579 添加功能
Merge pull request !9579 from 李鹏宇/dev_zhou
2026-03-11 06:47:12 +00:00
李鹏宇 e30d8cd55a !9578 !9577 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9578 from 李鹏宇/dev
2026-03-11 04:00:18 +00:00
李鹏宇 ff08b16250 !9577 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 !9577 from 李鹏宇/dev_wang
2026-03-11 03:59:58 +00:00
李鹏宇 42fd70e444 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-11 11:59:27 +08:00
李鹏宇 7b01a7ebe9 公开招租审批 2026-03-11 11:59:00 +08:00
pengyuthon 42dc0ee8e8 Merge remote-tracking branch 'origin/dev' into dev 2026-03-11 11:52:40 +08:00
李鹏宇 78cb5b1d99 !9576 !9575 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9576 from 李鹏宇/dev
2026-03-11 03:45:06 +00:00
李鹏宇 c0ca9f4867 !9575 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 !9575 from 李鹏宇/dev_wang
2026-03-11 03:44:43 +00:00