Commit Graph
100 Commits
Author SHA1 Message Date
李鹏宇 1123b77946 菜单权限 2026-05-06 20:08:38 +08:00
李鹏宇 192c3ae105 菜单权限 2026-05-06 20:00:58 +08:00
李鹏宇 44e44e1e8d 菜单权限 2026-05-06 19:53:33 +08:00
李鹏宇 b89bd713c2 菜单权限 2026-05-06 19:48:54 +08:00
李鹏宇 4d8a2fd91a 菜单权限 2026-05-06 19:16:12 +08:00
李鹏宇 b2694b8f59 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-05-06 19:08:29 +08:00
李鹏宇 c47dcae20f 餐饮人员配置自动更新备注 2026-05-06 19:07:48 +08:00
李鹏宇 2568f32e42 !11276 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 !11276 from 李鹏宇/dev_wang
2026-05-06 09:45:06 +00:00
李鹏宇 60c35e1ea2 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-05-06 17:44:36 +08:00
李鹏宇 cac356780b 按钮 2026-05-06 17:44:25 +08:00
李鹏宇 bc3d52d6cb !11274 租赁合同审批,字段联动
Merge pull request !11274 from 李鹏宇/dev_wang
2026-05-06 09:38:44 +00:00
李鹏宇 824cd00461 租赁合同审批,字段联动 2026-05-06 17:33:44 +08:00
李鹏宇 0a4770849e !11272 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 !11272 from 李鹏宇/dev_wang
2026-05-06 02:18:09 +00:00
李鹏宇 1d92d3ed4b Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-05-06 10:13:24 +08:00
李鹏宇 e7b7dcda94 日程,导出 2026-05-06 10:13:06 +08:00
李鹏宇 979087e997 !11270 添加功能
Merge pull request !11270 from 李鹏宇/dev_zhou
2026-04-30 10:02:51 +00:00
李鹏宇 1ca4654e63 !11268 添加功能
Merge pull request !11268 from 李鹏宇/dev_zhou
2026-04-30 10:01:51 +00:00
李鹏宇 eb30e8717d !11266 添加功能
Merge pull request !11266 from 李鹏宇/dev_zhou
2026-04-30 09:48:48 +00:00
李鹏宇 5651d2292e !11264 表单调整
Merge pull request !11264 from 李鹏宇/dev_wang
2026-04-30 09:44:12 +00:00
李鹏宇 0b4764e16f 表单调整 2026-04-30 17:43:35 +08:00
李鹏宇 ee91ffae1a 表单调整 2026-04-30 17:14:51 +08:00
李鹏宇 cd85459e7b !11262 表单调整
Merge pull request !11262 from 李鹏宇/dev_wang
2026-04-30 09:08:43 +00:00
李鹏宇 832a449d75 表单调整 2026-04-30 17:08:02 +08:00
李鹏宇 8b97f0f6f6 !11260 用章类型必填
Merge pull request !11260 from 李鹏宇/dev_wang
2026-04-30 08:22:25 +00:00
李鹏宇 22bcc7d192 用章类型必填 2026-04-30 16:21:55 +08:00
李鹏宇 9e864d5949 用章类型必填 2026-04-30 16:18:05 +08:00
李鹏宇 1d240d7f5f !11258 添加功能
Merge pull request !11258 from 李鹏宇/dev_zhou
2026-04-30 07:00:01 +00:00
李鹏宇 42dbb67705 !11256 视图显示
Merge pull request !11256 from 李鹏宇/dev_wang
2026-04-30 03:28:06 +00:00
李鹏宇 f6a8ca376a 视图显示 2026-04-30 11:26:25 +08:00
李鹏宇 3cd51a2d3a !11254 视图显示
Merge pull request !11254 from 李鹏宇/dev_wang
2026-04-30 02:14:25 +00:00
李鹏宇 d4f2ac1345 视图显示 2026-04-30 10:13:26 +08:00
李鹏宇 d81935eb49 !11252 添加功能
Merge pull request !11252 from 李鹏宇/dev_zhou
2026-04-30 02:01:04 +00:00
李鹏宇 0f6fc4f890 !11250 日程时间倒序
Merge pull request !11250 from 李鹏宇/dev_wang
2026-04-29 11:57:46 +00:00
李鹏宇 f701400798 日程时间倒序 2026-04-29 19:56:50 +08:00
李鹏宇 19ea8ddc4c !11248 日程时间倒序
Merge pull request !11248 from 李鹏宇/dev_wang
2026-04-29 11:44:16 +00:00
李鹏宇 8efa962373 日程时间倒序 2026-04-29 19:43:42 +08:00
李鹏宇 06b0bb9972 !11246 添加功能
Merge pull request !11246 from 李鹏宇/dev_zhou
2026-04-29 11:40:06 +00:00
李鹏宇 d703a884bb !11244 辅助角色删除修复
Merge pull request !11244 from 李鹏宇/dev_wang
2026-04-29 11:21:25 +00:00
李鹏宇 47e2a6b43b 辅助角色删除修复 2026-04-29 19:20:07 +08:00
李鹏宇 ca8f5a99e3 !11242 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 !11242 from 李鹏宇/dev_wang
2026-04-29 10:13:37 +00:00
李鹏宇 6983b13df3 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-29 18:12:53 +08:00
李鹏宇 809195e23e 明细行优化 2026-04-29 18:12:41 +08:00
李鹏宇 b07c325153 !11240 添加功能
Merge pull request !11240 from 李鹏宇/dev_zhou
2026-04-29 10:11:04 +00:00
李鹏宇 2020afcb78 !11238 添加功能
Merge pull request !11238 from 李鹏宇/dev_zhou
2026-04-29 09:46:42 +00:00
李鹏宇 7f4882bab2 !11236 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 !11236 from 李鹏宇/dev_wang
2026-04-29 09:26:23 +00:00
李鹏宇 c292ef6401 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-29 17:24:24 +08:00
李鹏宇 586526b7bf 入库提醒 2026-04-29 17:24:13 +08:00
李鹏宇 8c6def1ea5 !11234 添加功能
Merge pull request !11234 from 李鹏宇/dev_zhou
2026-04-29 07:41:57 +00:00
李鹏宇 d3e80748cc !11232 添加功能
Merge pull request !11232 from 李鹏宇/dev_zhou
2026-04-29 07:37:58 +00:00
李鹏宇 f2ec58fb5a !11230 注释
Merge pull request !11230 from 李鹏宇/dev_wang
2026-04-29 07:27:17 +00:00
李鹏宇 5335c66f37 注释 2026-04-29 15:26:23 +08:00
李鹏宇 a122189612 !11228 添加功能
Merge pull request !11228 from 李鹏宇/dev_zhou
2026-04-29 07:07:57 +00:00
李鹏宇 6690141246 !11226 添加功能
Merge pull request !11226 from 李鹏宇/dev_zhou
2026-04-29 03:49:58 +00:00
李鹏宇 74895efb38 !11224 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 !11224 from 李鹏宇/dev_wang
2026-04-29 03:29:55 +00:00
李鹏宇 57b7e182d4 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-29 11:28:43 +08:00
李鹏宇 0a32e73756 注释 2026-04-29 11:28:23 +08:00
李鹏宇 3ce02132a5 !11222 添加功能
Merge pull request !11222 from 李鹏宇/dev_zhou
2026-04-29 03:25:22 +00:00
李鹏宇 a11ebb071b Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-29 11:22:49 +08:00
李鹏宇 8f1783c93a 采购订单 2026-04-29 11:21:53 +08:00
李鹏宇 4f6a3f13fc !11220 添加功能
Merge pull request !11220 from 李鹏宇/dev_zhou
2026-04-29 03:20:33 +00:00
李鹏宇 a223886aae !11218 添加功能
Merge pull request !11218 from 李鹏宇/dev_zhou
2026-04-29 03:13:17 +00:00
李鹏宇 4908114d85 !11216 添加功能
Merge pull request !11216 from 李鹏宇/dev_zhou
2026-04-29 03:08:37 +00:00
李鹏宇 94b47d2af1 !11214 Merge branch 'master' into dev_zhou
Merge pull request !11214 from 李鹏宇/dev_zhou
2026-04-29 02:32:17 +00:00
李鹏宇 7c6e06183e !11213 !11212 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !11213 from 李鹏宇/dev
2026-04-28 10:57:43 +00:00
李鹏宇 aaedc48030 !11212 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 !11212 from 李鹏宇/dev_wang
2026-04-28 10:57:19 +00:00
李鹏宇 943df9b019 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-28 18:54:47 +08:00
李鹏宇 93fc6d4e86 搜索 2026-04-28 18:54:34 +08:00
李鹏宇 3747d85a2d !11211 !11210 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !11211 from 李鹏宇/dev
2026-04-28 08:38:49 +00:00
李鹏宇 b64d79caef !11210 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 !11210 from 李鹏宇/dev_wang
2026-04-28 08:38:12 +00:00
李鹏宇 590d87e81d Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-28 16:37:22 +08:00
李鹏宇 cdd9de16af 日程 2026-04-28 16:37:01 +08:00
李鹏宇 157f23a783 !11209 !11208 入库
Merge pull request !11209 from 李鹏宇/dev
2026-04-28 08:05:19 +00:00
李鹏宇 3d575dbd7a !11208 入库
Merge pull request !11208 from 李鹏宇/dev_wang
2026-04-28 08:04:44 +00:00
李鹏宇 c19268e584 入库 2026-04-28 16:02:36 +08:00
李鹏宇 d4196ed35e !11207 !11206 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyuse…
Merge pull request !11207 from 李鹏宇/dev
2026-04-28 07:28:58 +00:00
李鹏宇 9968fbf3cc !11206 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 !11206 from 李鹏宇/dev_wang
2026-04-28 07:28:36 +00:00
李鹏宇 e02a75a369 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-28 15:27:45 +08:00
李鹏宇 66551d4b80 入库 2026-04-28 15:27:05 +08:00
李鹏宇 a817940cb7 !11205 !11204 添加功能
Merge pull request !11205 from 李鹏宇/dev
2026-04-28 07:24:06 +00:00
李鹏宇 661fa11cc4 !11204 添加功能
Merge pull request !11204 from 李鹏宇/dev_zhou
2026-04-28 07:23:36 +00:00
李鹏宇 e73e5d0bdc !11203 !11202 添加功能
Merge pull request !11203 from 李鹏宇/dev
2026-04-28 07:17:07 +00:00
李鹏宇 db201fd9e6 !11202 添加功能
Merge pull request !11202 from 李鹏宇/dev_zhou
2026-04-28 07:16:41 +00:00
李鹏宇 13b04b4e65 !11201 !11200 添加功能
Merge pull request !11201 from 李鹏宇/dev
2026-04-28 02:35:00 +00:00
李鹏宇 bcbe1256ca !11200 添加功能
Merge pull request !11200 from 李鹏宇/dev_zhou
2026-04-28 02:34:32 +00:00
李鹏宇 c7c94a85cb !11199 !11198 采购
Merge pull request !11199 from 李鹏宇/dev
2026-04-28 02:23:45 +00:00
李鹏宇 b597138431 !11198 采购
Merge pull request !11198 from 李鹏宇/dev_wang
2026-04-28 02:23:23 +00:00
李鹏宇 d837d899cb 采购 2026-04-28 10:17:19 +08:00
李鹏宇 44cf31e832 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-04-28 10:15:39 +08:00
李鹏宇 46c205a35d 采购 2026-04-28 10:15:26 +08:00
李鹏宇 3210064f26 !11197 !11196 添加功能
Merge pull request !11197 from 李鹏宇/dev
2026-04-27 09:51:01 +00:00
李鹏宇 b17d77ef78 !11196 添加功能
Merge pull request !11196 from 李鹏宇/dev_zhou
2026-04-27 09:50:01 +00:00
李鹏宇 83b30ead77 !11195 !11194 添加功能
Merge pull request !11195 from 李鹏宇/dev
2026-04-27 08:55:43 +00:00
李鹏宇 ca87db9361 !11194 添加功能
Merge pull request !11194 from 李鹏宇/dev_zhou
2026-04-27 08:55:25 +00:00
李鹏宇 ff2d673084 !11193 !11192 添加功能
Merge pull request !11193 from 李鹏宇/dev
2026-04-27 07:11:20 +00:00
李鹏宇 7f097d4b11 !11192 添加功能
Merge pull request !11192 from 李鹏宇/dev_zhou
2026-04-27 07:10:57 +00:00
李鹏宇 92494ddef2 !11191 Merge branch 'master' into dev
Merge pull request !11191 from 李鹏宇/dev
2026-04-27 06:58:14 +00:00
pengyuthon aa28cfa1c9 Merge branch 'master' into dev 2026-04-27 13:35:21 +08:00
pengyuthon 6d89f6abca Merge remote-tracking branch 'origin/dev' into dev 2026-04-27 13:35:14 +08:00
pengyuthon e0bd39561c 日程 2026-04-27 13:34:36 +08:00
李鹏宇 f9c888cb73 !11190 !11189 添加功能
Merge pull request !11190 from 李鹏宇/dev
2026-04-27 02:42:23 +00:00