Commit Graph
100 Commits
Author SHA1 Message Date
李鹏宇 61e32f4ee0 不让创建 2026-04-02 18:56:51 +08:00
李鹏宇 fdf0380089 餐费报表权限 2026-04-02 18:21:37 +08:00
李鹏宇 a271ee5832 餐费报表权限 2026-04-02 18:15:35 +08:00
李鹏宇 bab3307230 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-02 17:59:40 +08:00
李鹏宇 71a36573c0 餐费报表权限 2026-04-02 17:59:29 +08:00
李鹏宇 88286c0a2a !10526 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 !10526 from 李鹏宇/dev_wang
2026-04-02 09:52:37 +00:00
李鹏宇 5574e29e26 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-02 17:52:04 +08:00
李鹏宇 1dc30aed4e 餐费报表权限 2026-04-02 17:51:53 +08:00
李鹏宇 737ecbe37e !10524 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 !10524 from 李鹏宇/dev_wang
2026-04-02 09:46:21 +00:00
李鹏宇 acd6a8db8f Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-02 17:45:43 +08:00
李鹏宇 ac7ea87e78 餐费报表权限 2026-04-02 17:45:32 +08:00
李鹏宇 0cd2e9f9f5 !10522 添加功能
Merge pull request !10522 from 李鹏宇/dev_zhou
2026-04-02 09:26:39 +00:00
李鹏宇 cd74736405 !10520 添加功能
Merge pull request !10520 from 李鹏宇/dev_zhou
2026-04-02 09:20:05 +00:00
李鹏宇 c210b1d2ac !10518 添加功能
Merge pull request !10518 from dev_zhou
2026-04-02 08:55:04 +00:00
李鹏宇 608a8896d5 !10516 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 !10516 from 李鹏宇/dev_wang
2026-04-02 08:18:14 +00:00
李鹏宇 8f7dc3ddce Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-02 16:17:36 +08:00
李鹏宇 1f79686246 餐费定时任务,合同公司过滤 2026-04-02 16:17:26 +08:00
李鹏宇 57550f797c !10514 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 !10514 from 李鹏宇/dev_wang
2026-04-02 07:48:37 +00:00
李鹏宇 098f859a25 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-02 15:47:22 +08:00
李鹏宇 b26649a6e5 餐费修改 2026-04-02 15:47:09 +08:00
李鹏宇 1e0428f680 !10512 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 !10512 from 李鹏宇/dev_wang
2026-04-02 06:58:47 +00:00
李鹏宇 cc74c524c4 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-02 14:52:48 +08:00
李鹏宇 a7746bae6a 餐费修改 2026-04-02 14:51:55 +08:00
李鹏宇 15054d529e !10510 添加功能
Merge pull request !10510 from 李鹏宇/dev_zhou
2026-04-02 03:58:42 +00:00
李鹏宇 f2c53b5882 !10508 添加功能
Merge pull request !10508 from 李鹏宇/dev_zhou
2026-04-02 03:30:49 +00:00
李鹏宇 f11b592a09 !10506 添加功能
Merge pull request !10506 from 李鹏宇/dev_zhou
2026-04-02 03:22:22 +00:00
李鹏宇 ab1e281cb1 !10504 添加功能
Merge pull request !10504 from 李鹏宇/dev_zhou
2026-04-02 02:32:57 +00:00
李鹏宇 31aff95550 !10502 添加功能
Merge pull request !10502 from 李鹏宇/dev_zhou
2026-04-02 02:19:42 +00:00
李鹏宇 38517ef5ba !10500 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 !10500 from 李鹏宇/dev_wang
2026-04-02 02:18:39 +00:00
李鹏宇 661e3b1363 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-02 10:17:07 +08:00
李鹏宇 da710dfe10 餐费修改 2026-04-02 10:16:56 +08:00
李鹏宇 25fba2055c !10498 添加功能
Merge pull request !10498 from 李鹏宇/dev_zhou
2026-04-02 02:07:12 +00:00
李鹏宇 f7dff7d0b6 !10497 !10496 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10497 from 李鹏宇/dev
2026-04-01 12:26:55 +00:00
李鹏宇 3364898ef5 !10496 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 !10496 from 李鹏宇/dev_wang
2026-04-01 12:26:31 +00:00
李鹏宇 64d9e1e7cd Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 20:25:49 +08:00
李鹏宇 e3aaedbed9 党费,餐费 2026-04-01 20:25:40 +08:00
李鹏宇 31ad2fa5c4 !10495 !10494 添加功能
Merge pull request !10495 from 李鹏宇/dev
2026-04-01 12:12:19 +00:00
李鹏宇 b4c01f0985 !10494 添加功能
Merge pull request !10494 from 李鹏宇/dev_zhou
2026-04-01 12:11:57 +00:00
李鹏宇 b2599aa829 !10493 !10492 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10493 from 李鹏宇/dev
2026-04-01 12:05:30 +00:00
李鹏宇 1095287972 !10492 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 !10492 from 李鹏宇/dev_wang
2026-04-01 12:05:08 +00:00
李鹏宇 84f81c819c Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 20:04:31 +08:00
李鹏宇 a2d1b028fc 党费,餐费 2026-04-01 20:04:21 +08:00
李鹏宇 8360425078 !10491 !10490 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10491 from 李鹏宇/dev
2026-04-01 11:58:19 +00:00
李鹏宇 5ea08ccd70 !10490 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 !10490 from 李鹏宇/dev_wang
2026-04-01 11:57:58 +00:00
李鹏宇 3fcb1582ad Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 19:57:17 +08:00
李鹏宇 2931064714 党费,餐费 2026-04-01 19:57:02 +08:00
李鹏宇 bbbaaada39 !10489 !10488 添加功能
Merge pull request !10489 from 李鹏宇/dev
2026-04-01 10:31:09 +00:00
李鹏宇 29a0065814 !10488 添加功能
Merge pull request !10488 from 李鹏宇/dev_zhou
2026-04-01 10:30:49 +00:00
李鹏宇 cfd83a0bcb !10487 !10486 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10487 from 李鹏宇/dev
2026-04-01 09:08:38 +00:00
李鹏宇 3103ce6a04 !10486 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 !10486 from 李鹏宇/dev_wang
2026-04-01 09:08:16 +00:00
李鹏宇 4d0a0e795d !10485 !10484 添加功能
Merge pull request !10485 from 李鹏宇/dev
2026-04-01 09:05:22 +00:00
李鹏宇 59b4aa2ef3 !10484 添加功能
Merge pull request !10484 from 李鹏宇/dev_zhou
2026-04-01 09:05:00 +00:00
李鹏宇 b6e02d75eb Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 17:03:55 +08:00
李鹏宇 75d033c83b 字段拼不全局 2026-04-01 17:03:33 +08:00
李鹏宇 f472388455 !10482 !10481 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10482 from 李鹏宇/dev
2026-04-01 08:43:15 +00:00
李鹏宇 7df743592d !10481 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 !10481 from 李鹏宇/dev_wang
2026-04-01 08:42:55 +00:00
李鹏宇 a95718d070 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 16:42:13 +08:00
李鹏宇 0a5808de79 不创建 2026-04-01 16:41:46 +08:00
李鹏宇 626531cb1e !10480 !10479 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10480 from 李鹏宇/dev
2026-04-01 07:58:03 +00:00
李鹏宇 1162788a4a !10479 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 !10479 from 李鹏宇/dev_wang
2026-04-01 07:57:34 +00:00
李鹏宇 038fc56879 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 15:56:08 +08:00
李鹏宇 8eadb00877 拼接名称 2026-04-01 15:55:59 +08:00
李鹏宇 23101f21a7 !10478 !10477 添加功能
Merge pull request !10478 from 李鹏宇/dev
2026-04-01 07:44:16 +00:00
李鹏宇 8b2b0cab76 !10477 添加功能
Merge pull request !10477 from 李鹏宇/dev_zhou
2026-04-01 07:43:54 +00:00
李鹏宇 c0bbd679c6 !10476 !10475 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10476 from 李鹏宇/dev
2026-04-01 07:31:11 +00:00
李鹏宇 b41518768f !10475 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 !10475 from 李鹏宇/dev_wang
2026-04-01 07:30:51 +00:00
李鹏宇 8318097e5f Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 15:29:16 +08:00
李鹏宇 8c61848817 附件 2026-04-01 15:29:06 +08:00
李鹏宇 aadc4a05a9 !10474 !10473 添加功能
Merge pull request !10474 from 李鹏宇/dev
2026-04-01 07:18:49 +00:00
李鹏宇 7ba5b13144 !10473 添加功能
Merge pull request !10473 from 李鹏宇/dev_zhou
2026-04-01 07:18:27 +00:00
李鹏宇 9d8c5a3058 !10472 !10471 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10472 from 李鹏宇/dev
2026-04-01 07:08:33 +00:00
李鹏宇 8c975dfe03 !10471 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 !10471 from 李鹏宇/dev_wang
2026-04-01 07:08:11 +00:00
李鹏宇 0cae661f47 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 15:07:25 +08:00
李鹏宇 08584d4071 附件 2026-04-01 15:07:14 +08:00
李鹏宇 5ed1c0d4f5 !10470 !10468 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10470 from 李鹏宇/dev
2026-04-01 06:54:47 +00:00
李鹏宇 4d4fc7d11f !10468 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 !10468 from 李鹏宇/dev_wang
2026-04-01 06:53:53 +00:00
李鹏宇 3ef1395403 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 14:51:35 +08:00
李鹏宇 1e9bcee6e4 附件 2026-04-01 14:51:15 +08:00
李鹏宇 4056cf2a98 !10467 !10466 添加功能
Merge pull request !10467 from 李鹏宇/dev
2026-04-01 03:19:26 +00:00
李鹏宇 c8655cfc1a !10466 添加功能
Merge pull request !10466 from 李鹏宇/dev_zhou
2026-04-01 03:18:43 +00:00
李鹏宇 f4a1c9fe13 !10465 !10464 添加功能
Merge pull request !10465 from 李鹏宇/dev
2026-04-01 02:54:27 +00:00
李鹏宇 499d270291 !10464 添加功能
Merge pull request !10464 from 李鹏宇/dev_zhou
2026-04-01 02:54:08 +00:00
李鹏宇 0b9f210cc6 !10463 !10462 打印
Merge pull request !10463 from 李鹏宇/dev
2026-04-01 02:45:21 +00:00
李鹏宇 2cf24beab2 !10462 打印
Merge pull request !10462 from 李鹏宇/dev_wang
2026-04-01 02:45:01 +00:00
李鹏宇 854228c82d 打印 2026-04-01 10:43:28 +08:00
李鹏宇 a9210e8019 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-01 10:29:28 +08:00
李鹏宇 1c7f3695aa 本月实收总额 2026-04-01 10:29:15 +08:00
李鹏宇 acd670ccf9 !10461 小红点
Merge pull request !10461 from 李鹏宇/dev
2026-03-31 13:14:26 +00:00
pengyuthon 37c63e1abd 小红点 2026-03-31 21:13:03 +08:00
李鹏宇 cc1ee20756 !10460 !10459 添加功能
Merge pull request !10460 from 李鹏宇/dev
2026-03-31 12:58:04 +00:00
李鹏宇 703643e9dd !10459 添加功能
Merge pull request !10459 from 李鹏宇/dev_zhou
2026-03-31 12:57:43 +00:00
李鹏宇 e834183d4e !10458 !10457 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10458 from 李鹏宇/dev
2026-03-31 12:57:34 +00:00
李鹏宇 7186cd7adc !10457 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 !10457 from 李鹏宇/dev_wang
2026-03-31 12:57:15 +00:00
李鹏宇 57d6a7e593 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-31 20:56:17 +08:00
李鹏宇 028326b706 苹果按钮 2026-03-31 20:56:00 +08:00
李鹏宇 2df0f522ac !10456 !10455 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10456 from 李鹏宇/dev
2026-03-31 12:29:55 +00:00
李鹏宇 32a9d8c865 !10455 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 !10455 from 李鹏宇/dev_wang
2026-03-31 12:29:34 +00:00
李鹏宇 bed4e6cebb Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-31 20:28:58 +08:00
李鹏宇 850d0105d9 押金前期实收 2026-03-31 20:28:48 +08:00
李鹏宇 9ebb6d5a00 !10454 !10453 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10454 from 李鹏宇/dev
2026-03-31 11:55:23 +00:00