Commit Graph
17471 Commits
Author SHA1 Message Date
李鹏宇 b1690e6326 !9083 添加功能
Merge pull request !9083 from 李鹏宇/dev_zhou
2026-02-28 08:50:01 +00:00
李鹏宇 1c22b0d0e3 添加功能 2026-02-28 16:49:33 +08:00
李鹏宇 14ee98dad5 !9082 !9081 添加功能
Merge pull request !9082 from 李鹏宇/dev
2026-02-28 08:47:10 +00:00
李鹏宇 b6e6346e20 !9081 添加功能
Merge pull request !9081 from 李鹏宇/dev_zhou
2026-02-28 08:46:50 +00:00
李鹏宇 46e618db03 !9080 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !9080 from 李鹏宇/dev
2026-02-28 08:46:15 +00:00
李鹏宇 94066b18a7 添加功能 2026-02-28 16:46:10 +08:00
pengyuthon 7703bbe1fe Merge remote-tracking branch 'origin/dev' into dev 2026-02-28 16:35:04 +08:00
pengyuthon 0acc27335b 考勤机 2026-02-28 16:34:45 +08:00
李鹏宇 280e5139d4 !9079 !9078 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9079 from 李鹏宇/dev
2026-02-28 07:52:57 +00:00
李鹏宇 a4696b3f47 !9078 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 !9078 from 李鹏宇/dev_wang
2026-02-28 07:52:33 +00:00
李鹏宇 9d41a1c74a Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-28 15:51:52 +08:00
李鹏宇 c4b93679af 办结时间倒序 2026-02-28 15:51:33 +08:00
李鹏宇 7a56e70fbf !9077 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 !9077 from 李鹏宇/dev_wang
2026-02-28 07:28:33 +00:00
李鹏宇 a51d7b3ece Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-28 15:25:07 +08:00
李鹏宇 980975ad18 成交确认书字段,办结时间倒序 2026-02-28 15:24:52 +08:00
李鹏宇 d7a90e820a !9076 !9075 添加功能
Merge pull request !9076 from 李鹏宇/dev
2026-02-28 03:56:36 +00:00
李鹏宇 d774830e3f !9075 添加功能
Merge pull request !9075 from 李鹏宇/dev_zhou
2026-02-28 03:56:18 +00:00
李鹏宇 6f49335fcd 添加功能 2026-02-28 11:55:48 +08:00
李鹏宇 982b1ccd45 !9074 !9073 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9074 from 李鹏宇/dev
2026-02-28 03:38:21 +00:00
李鹏宇 de3dbcd0ee !9073 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 !9073 from 李鹏宇/dev_wang
2026-02-28 03:37:55 +00:00
李鹏宇 d6c77817a6 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-28 11:37:11 +08:00
李鹏宇 afff868c9e 餐饮定时任务 2026-02-28 11:36:55 +08:00
pengyuthon 318b0d81ed 餐饮 2026-02-28 11:36:33 +08:00
李鹏宇 0fe3053d4e !9072 !9071 添加功能
Merge pull request !9072 from 李鹏宇/dev
2026-02-28 03:05:17 +00:00
李鹏宇 5aec4c1763 !9071 添加功能
Merge pull request !9071 from 李鹏宇/dev_zhou
2026-02-28 03:04:54 +00:00
李鹏宇 8b9f9faf4f 添加功能 2026-02-28 11:04:23 +08:00
李鹏宇 0f45c44ba5 !9070 !9069 添加功能
Merge pull request !9070 from 李鹏宇/dev
2026-02-28 02:48:42 +00:00
李鹏宇 b273ac4272 !9069 添加功能
Merge pull request !9069 from 李鹏宇/dev_zhou
2026-02-28 02:48:22 +00:00
李鹏宇 36e2bb7df1 添加功能 2026-02-28 10:47:31 +08:00
李鹏宇 39522a97d5 餐饮收集任务 2026-02-28 10:17:34 +08:00
李鹏宇 a9a42252ef !9068 !9067 添加功能
Merge pull request !9068 from 李鹏宇/dev
2026-02-28 01:52:43 +00:00
李鹏宇 4f99e2cc0f !9067 添加功能
Merge pull request !9067 from 李鹏宇/dev_zhou
2026-02-28 01:52:18 +00:00
李鹏宇 1c7780ccde 添加功能 2026-02-28 09:51:04 +08:00
李鹏宇 3576f562b0 !9066 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !9066 from 李鹏宇/dev
2026-02-28 01:41:50 +00:00
pengyuthon a84becfaa9 Merge remote-tracking branch 'origin/dev' into dev 2026-02-28 09:37:59 +08:00
pengyuthon b53d4e4ec9 餐饮 2026-02-28 09:37:42 +08:00
李鹏宇 86cf6dc2be !9065 !9064 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9065 from 李鹏宇/dev
2026-02-27 13:26:20 +00:00
李鹏宇 004286a095 !9064 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 !9064 from 李鹏宇/dev_wang
2026-02-27 13:25:46 +00:00
李鹏宇 9049f1e887 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 21:23:20 +08:00
李鹏宇 ea39837c62 preview easy 2026-02-27 21:22:58 +08:00
李鹏宇 e35077d33d 添加功能 2026-02-27 21:11:00 +08:00
李鹏宇 c5d8d38fd5 !9063 !9062 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9063 from 李鹏宇/dev
2026-02-27 13:00:46 +00:00
李鹏宇 5ef81b4e79 !9062 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 !9062 from 李鹏宇/dev_wang
2026-02-27 13:00:22 +00:00
李鹏宇 c320550ad0 !9061 !9060 Merge branch 'master' into dev_zhou
Merge pull request !9061 from 李鹏宇/dev
2026-02-27 12:59:05 +00:00
李鹏宇 c737bb52b1 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 20:58:47 +08:00
李鹏宇 b0dd5c1a13 !9060 Merge branch 'master' into dev_zhou
Merge pull request !9060 from 李鹏宇/dev_zhou
2026-02-27 12:57:51 +00:00
李鹏宇 368814896d 老师 2026-02-27 20:57:48 +08:00
李鹏宇 783a80de08 Merge branch 'master' into dev_zhou
# Conflicts:
#	soong_workflow/views/soong_workflow_record.xml
2026-02-27 20:57:26 +08:00
李鹏宇 151cfc8659 添加功能 2026-02-27 20:53:50 +08:00
李鹏宇 b107407acc !9059 花名册数量
Merge pull request !9059 from 李鹏宇/dev
2026-02-27 12:10:07 +00:00