Commit Graph
100 Commits
Author SHA1 Message Date
李鹏宇 1ae9d3fc06 报表 2026-03-23 16:22:16 +08:00
李鹏宇 b67fe70192 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-23 16:01:19 +08:00
李鹏宇 6762078028 报表 2026-03-23 16:00:59 +08:00
李鹏宇 5edaa71cef !10082 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 !10082 from 李鹏宇/dev_wang
2026-03-23 07:45:18 +00:00
李鹏宇 b9c8ba873f Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-23 15:40:29 +08:00
李鹏宇 a0b92fa83e 报表 2026-03-23 15:39:47 +08:00
李鹏宇 4724609713 !10080 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 !10080 from 李鹏宇/dev_wang
2026-03-23 03:31:12 +00:00
李鹏宇 6e7f309d9d Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-23 11:30:20 +08:00
李鹏宇 7294ec37bb 报表 2026-03-23 11:30:06 +08:00
李鹏宇 17bad74fa1 !10078 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 !10078 from 李鹏宇/dev_wang
2026-03-23 03:09:55 +00:00
李鹏宇 75331e6a14 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-23 11:09:04 +08:00
李鹏宇 8a036c83c4 报表 2026-03-23 11:08:53 +08:00
李鹏宇 fc94a3a7de !10076 添加功能
Merge pull request !10076 from 李鹏宇/dev_zhou
2026-03-23 03:04:26 +00:00
李鹏宇 78253f7e86 !10074 添加功能
Merge pull request !10074 from 李鹏宇/dev_zhou
2026-03-23 02:57:52 +00:00
李鹏宇 5e8dc26fc1 !10072 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 !10072 from 李鹏宇/dev_wang
2026-03-23 02:53:54 +00:00
李鹏宇 9bf89e8cdb Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-23 10:53:20 +08:00
李鹏宇 6efdb2199f 报表 2026-03-23 10:53:12 +08:00
李鹏宇 f90fa2b454 !10070 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 !10070 from 李鹏宇/dev_wang
2026-03-23 02:31:25 +00:00
李鹏宇 18bbed11b1 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-23 10:30:34 +08:00
李鹏宇 364efe6c27 报表 2026-03-23 10:30:22 +08:00
李鹏宇 b675efba63 !10068 添加功能
Merge pull request !10068 from 李鹏宇/dev_zhou
2026-03-23 02:24:11 +00:00
李鹏宇 7331a90f7c !10066 添加功能
Merge pull request !10066 from 李鹏宇/dev_zhou
2026-03-23 02:22:38 +00:00
李鹏宇 d1548edb22 !10065 !10064 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10065 from 李鹏宇/master
2026-03-23 02:11:11 +00:00
李鹏宇 72eb7f2bf3 !10064 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 !10064 from 李鹏宇/dev_wang
2026-03-23 02:10:46 +00:00
李鹏宇 21670fd173 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-23 10:10:09 +08:00
李鹏宇 1f0739c858 报表 2026-03-23 10:09:58 +08:00
李鹏宇 184122ff35 !10063 !10062 添加功能
Merge pull request !10063 from 李鹏宇/dev
2026-03-23 01:58:15 +00:00
李鹏宇 bb93feac67 !10062 添加功能
Merge pull request !10062 from 李鹏宇/dev_zhou
2026-03-23 01:57:56 +00:00
李鹏宇 02bdeaa6a5 !10061 !10060 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10061 from 李鹏宇/dev
2026-03-23 01:51:22 +00:00
李鹏宇 75ca5e090a !10060 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 !10060 from 李鹏宇/dev_wang
2026-03-23 01:50:59 +00:00
李鹏宇 784f3b86d9 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-23 09:46:23 +08:00
李鹏宇 06c1ca4af3 报表 2026-03-23 09:45:37 +08:00
pengyuthon e5172e5178 Merge remote-tracking branch 'origin/dev' into dev 2026-03-22 10:46:29 +08:00
李鹏宇 2bfb1edfb7 !10059 !10058 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10059 from 李鹏宇/dev
2026-03-21 11:49:10 +00:00
李鹏宇 49efae3be5 !10058 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 !10058 from 李鹏宇/dev_wang
2026-03-21 11:48:47 +00:00
李鹏宇 378a62e56d Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-21 19:48:06 +08:00
李鹏宇 968a9618cf 报表 2026-03-21 19:47:55 +08:00
李鹏宇 b801af2028 !10057 !10056 添加功能
Merge pull request !10057 from 李鹏宇/dev
2026-03-21 11:34:32 +00:00
李鹏宇 51aeb3eb3b !10056 添加功能
Merge pull request !10056 from 李鹏宇/dev_zhou
2026-03-21 11:34:13 +00:00
李鹏宇 381bafca61 !10055 !10054 添加功能
Merge pull request !10055 from 李鹏宇/dev
2026-03-21 10:53:34 +00:00
李鹏宇 f6d6c2b2bc !10054 添加功能
Merge pull request !10054 from 李鹏宇/dev_zhou
2026-03-21 10:53:16 +00:00
李鹏宇 c28315a927 !10053 !10052 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10053 from 李鹏宇/dev
2026-03-21 10:26:43 +00:00
李鹏宇 d8747da3cb !10052 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 !10052 from 李鹏宇/dev_wang
2026-03-21 10:26:21 +00:00
李鹏宇 83ba46e133 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-21 18:24:47 +08:00
李鹏宇 3b481f6ae6 报表 2026-03-21 18:24:37 +08:00
李鹏宇 4aedbf2311 !10051 !10050 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10051 from 李鹏宇/dev
2026-03-21 10:17:52 +00:00
李鹏宇 ee46ff2fca !10050 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 !10050 from 李鹏宇/dev_wang
2026-03-21 10:17:27 +00:00
李鹏宇 14512ea3ee Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-21 18:16:29 +08:00
李鹏宇 ae5aa8b03d 报表 2026-03-21 18:16:19 +08:00
李鹏宇 d2dec6eada !10049 !10048 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10049 from 李鹏宇/dev
2026-03-21 10:06:15 +00:00
李鹏宇 1c37d3ea74 !10048 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 !10048 from 李鹏宇/dev_wang
2026-03-21 10:05:52 +00:00
李鹏宇 0dd99475cc Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-21 18:05:03 +08:00
李鹏宇 157adf9ef6 报表 2026-03-21 18:04:53 +08:00
李鹏宇 f5064bb9d3 !10047 !10046 添加功能
Merge pull request !10047 from 李鹏宇/dev
2026-03-21 09:17:30 +00:00
李鹏宇 8ff53841fb !10046 添加功能
Merge pull request !10046 from 李鹏宇/dev_zhou
2026-03-21 09:17:07 +00:00
李鹏宇 569688b478 !10045 !10044 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10045 from 李鹏宇/dev
2026-03-21 09:11:54 +00:00
李鹏宇 530d046881 !10044 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 !10044 from 李鹏宇/dev_wang
2026-03-21 09:11:32 +00:00
李鹏宇 5849642f3b Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-21 17:10:57 +08:00
李鹏宇 de263182ad 报表 2026-03-21 17:10:47 +08:00
李鹏宇 11284a93f3 !10043 !10042 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10043 from 李鹏宇/dev
2026-03-21 09:05:49 +00:00
李鹏宇 333be9fbd0 !10042 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 !10042 from 李鹏宇/dev_wang
2026-03-21 09:05:21 +00:00
李鹏宇 68d8cf493b Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-21 17:04:24 +08:00
李鹏宇 c222c684c4 报表 2026-03-21 17:04:13 +08:00
李鹏宇 c60b0ca7fe !10041 !10040 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10041 from 李鹏宇/dev
2026-03-21 08:40:29 +00:00
李鹏宇 b32c538c9f !10040 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 !10040 from 李鹏宇/dev_wang
2026-03-21 08:40:04 +00:00
李鹏宇 1fecaaa61b Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-21 16:39:11 +08:00
李鹏宇 d748f55013 报表 2026-03-21 16:39:00 +08:00
李鹏宇 0982857f5c !10039 !10038 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10039 from 李鹏宇/dev
2026-03-21 08:26:22 +00:00
李鹏宇 3282bb9b26 !10038 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 !10038 from 李鹏宇/dev_wang
2026-03-21 08:25:56 +00:00
李鹏宇 2c9d34e4a0 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-21 16:25:17 +08:00
李鹏宇 6b0efc5802 报表 2026-03-21 16:25:04 +08:00
李鹏宇 5e71c932cc !10037 !10036 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10037 from 李鹏宇/dev
2026-03-21 08:10:55 +00:00
李鹏宇 803667c458 !10036 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 !10036 from 李鹏宇/dev_wang
2026-03-21 08:10:35 +00:00
李鹏宇 c678328d27 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-21 16:09:55 +08:00
李鹏宇 d8fe15c7d0 报表 2026-03-21 16:09:31 +08:00
李鹏宇 75ccdf7073 !10035 !10034 添加功能
Merge pull request !10035 from 李鹏宇/dev
2026-03-21 08:00:20 +00:00
李鹏宇 d554e4f2de !10034 添加功能
Merge pull request !10034 from 李鹏宇/dev_zhou
2026-03-21 07:59:51 +00:00
李鹏宇 e62ba8d645 !10033 !10032 添加功能
Merge pull request !10033 from 李鹏宇/dev
2026-03-20 12:58:58 +00:00
李鹏宇 a54cb87f2b !10032 添加功能
Merge pull request !10032 from 李鹏宇/dev_zhou
2026-03-20 12:58:28 +00:00
李鹏宇 04b670e389 !10031 !10030 添加功能
Merge pull request !10031 from 李鹏宇/dev
2026-03-20 12:44:17 +00:00
李鹏宇 ced3524479 !10030 添加功能
Merge pull request !10030 from dev_zhou
2026-03-20 12:43:46 +00:00
pengyuthon 309fd1f624 Merge branch 'master' into dev 2026-03-20 20:39:22 +08:00
李鹏宇 6d643e1898 !10029 添加功能
Merge pull request !10029 from dev_zhou
2026-03-20 12:34:58 +00:00
李鹏宇 0008b89aa0 !10028 !10027 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10028 from 李鹏宇/dev
2026-03-20 12:29:48 +00:00
李鹏宇 cc0b36f51d !10027 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 !10027 from 李鹏宇/dev_wang
2026-03-20 12:29:22 +00:00
李鹏宇 337a980993 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-20 20:28:29 +08:00
李鹏宇 6f2dba3d82 押金 2026-03-20 20:28:11 +08:00
李鹏宇 5d0eda69a0 !10026 苹果按钮
Merge pull request !10026 from 李鹏宇/dev
2026-03-20 12:24:58 +00:00
pengyuthon a89ca3d4b4 苹果按钮 2026-03-20 20:23:13 +08:00
pengyuthon 6314c70984 Merge remote-tracking branch 'origin/dev' into dev 2026-03-20 20:17:42 +08:00
李鹏宇 51d20cc75e !10025 !10024 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10025 from 李鹏宇/dev
2026-03-20 12:13:30 +00:00
李鹏宇 41c9c1e4e2 !10024 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 !10024 from 李鹏宇/dev_wang
2026-03-20 12:13:00 +00:00
李鹏宇 d35aede5cf Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-20 20:12:13 +08:00
李鹏宇 a3ec4e39f4 押金 2026-03-20 20:12:00 +08:00
李鹏宇 476f9a5dd2 !10023 !10022 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10023 from 李鹏宇/dev
2026-03-20 11:58:08 +00:00
李鹏宇 4b840386c2 !10022 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 !10022 from 李鹏宇/dev_wang
2026-03-20 11:57:43 +00:00
李鹏宇 41c69299a5 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-03-20 19:56:31 +08:00
李鹏宇 bf0c412d98 押金 2026-03-20 19:56:14 +08:00
李鹏宇 aa21792eef !10021 !10019 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !10021 from 李鹏宇/dev
2026-03-20 11:40:48 +00:00
李鹏宇 fcfbd64f97 !10020 !10018 添加功能
Merge pull request !10020 from 李鹏宇/dev
2026-03-20 11:40:26 +00:00