Commit Graph
16186 Commits
Author SHA1 Message Date
李鹏宇 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
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
李鹏宇 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
李鹏宇 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
李鹏宇 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
pengyuthon cbf34d6486 花名册数量 2026-02-27 20:08:28 +08:00
李鹏宇 a61d45ad4b !9058 Merge branch 'master' into dev
Merge pull request !9058 from 李鹏宇/dev
2026-02-27 11:48:13 +00:00
pengyuthon ec1fc86aa8 Merge branch 'master' into dev 2026-02-27 19:46:26 +08:00
pengyuthon b4064467f0 Merge remote-tracking branch 'origin/dev' into dev 2026-02-27 19:46:23 +08:00
pengyuthon c92c7453f8 花名册数量 2026-02-27 19:46:03 +08:00
李鹏宇 78cbd926ef !9057 !9056 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9057 from 李鹏宇/dev
2026-02-27 11:40:12 +00:00
李鹏宇 e7e28ee274 !9056 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 !9056 from 李鹏宇/dev_wang
2026-02-27 11:39:45 +00:00
李鹏宇 efd035630f Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 19:38:54 +08:00
李鹏宇 34098517ad 小程序权限管理过滤、删除、菜单配置日期倒序 2026-02-27 19:38:21 +08:00
李鹏宇 02e271538a !9055 !9054 添加功能
Merge pull request !9055 from 李鹏宇/dev
2026-02-27 10:42:10 +00:00
李鹏宇 f825f9c50d !9054 添加功能
Merge pull request !9054 from 李鹏宇/dev_zhou
2026-02-27 10:41:53 +00:00
李鹏宇 9c8d61ce02 添加功能 2026-02-27 18:40:45 +08:00
李鹏宇 df72f8e43b !9053 !9052 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9053 from 李鹏宇/dev
2026-02-27 10:20:20 +00:00
李鹏宇 2a6e4ee2f2 !9052 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 !9052 from 李鹏宇/dev_wang
2026-02-27 10:19:18 +00:00
李鹏宇 30041740fb Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 18:17:37 +08:00
李鹏宇 fb7a9066c3 固定资产导出,入库借用领用仓库限制 2026-02-27 18:16:33 +08:00
pengyuthon 918aeb4809 花名册数量 2026-02-27 17:53:14 +08:00
pengyuthon b86f45f325 Merge remote-tracking branch 'origin/dev' into dev 2026-02-27 17:52:44 +08:00
李鹏宇 70bc06c1dc 批量更新编号,字段只读修改 2026-02-27 16:33:22 +08:00
李鹏宇 f716ad8479 !9051 !9050 添加功能
Merge pull request !9051 from 李鹏宇/dev
2026-02-27 07:09:15 +00:00
李鹏宇 7331eef55f !9050 添加功能
Merge pull request !9050 from 李鹏宇/dev_zhou
2026-02-27 07:08:53 +00:00
李鹏宇 efe16ff59f 添加功能 2026-02-27 15:08:03 +08:00
李鹏宇 d99240dc86 !9049 !9048 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9049 from 李鹏宇/dev
2026-02-27 07:05:03 +00:00
李鹏宇 aa477646f6 !9048 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 !9048 from 李鹏宇/dev_wang
2026-02-27 07:04:35 +00:00
李鹏宇 c316eb2623 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 15:02:20 +08:00
李鹏宇 42e15a6dfb 餐饮人员配置人数字段 2026-02-27 15:00:59 +08:00
李鹏宇 e77f58b6e7 !9047 !9046 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9047 from 李鹏宇/dev
2026-02-27 03:59:59 +00:00
李鹏宇 7a1f9753f2 !9046 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 !9046 from 李鹏宇/dev_wang
2026-02-27 03:59:35 +00:00
李鹏宇 5dc28c1c27 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 11:58:39 +08:00
李鹏宇 cce40753a9 采购逻辑 2026-02-27 11:58:23 +08:00
李鹏宇 763745ae7c !9045 !9044 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9045 from 李鹏宇/dev
2026-02-27 01:41:41 +00:00
李鹏宇 52b308a045 !9044 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 !9044 from 李鹏宇/dev_wang
2026-02-27 01:41:17 +00:00
李鹏宇 2cebcb80cf Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-27 09:37:22 +08:00
李鹏宇 29ec7d22e2 列宽,列居中 2026-02-27 09:37:06 +08:00
李鹏宇 b7538efc3b !9043 !9042 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !9043 from 李鹏宇/dev
2026-02-26 13:37:54 +00:00