Commit Graph

165 Commits

Author SHA1 Message Date
89904fead1 fix 菜单时效范围 2024-03-21 20:23:20 +08:00
e256d18d36 fix 订单取消接口,分页权限控制 2024-03-21 18:14:33 +08:00
4366b68831 fix 代码优化 2024-03-20 12:42:48 +08:00
cheche
1ce60bedc2 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-20 09:55:17 +08:00
cheche
aba4fa7ee9 fix 删除日志优化 2024-03-20 09:55:13 +08:00
2d8393068f feat 订单聚合接口 2024-03-19 20:53:16 +08:00
0cde1d3d92 fix 表名称调整 2024-03-19 20:03:06 +08:00
f003e30169 fix 订餐null异常处理 2024-03-19 19:51:56 +08:00
7432fae103 fix 配送点增加 2024-03-19 18:02:31 +08:00
ecd162c7af fix 预定就餐送货地点 2024-03-19 17:51:15 +08:00
cheche
84398a566e Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-19 15:26:42 +08:00
cheche
217d9f7770 feat 配送点管理 2024-03-19 15:26:40 +08:00
84b402538e fix 菜单分页响应调整,增加详情接口 2024-03-19 14:59:21 +08:00
098d7c7e9d fix 代码优化 2024-03-19 14:26:24 +08:00
85220f87b8 fix cancelid默认值 2024-03-19 12:40:49 +08:00
793a3325f2 Squashed commit of the following:
commit d4ab7d407a141b80024f85eeaab0062bea016051
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 10:23:30 2024 +0800

    merge error

commit 6204fa4ed15e0be303f7eb62307476725b8e7e36
Merge: 7290f0b aaeacf4
Author: liguoyang <Ligy.97@foxmail.com>
Date:   Tue Mar 19 10:19:41 2024 +0800

    Merge branch 'feat-PlacePermission' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-PlacePermission

commit 7290f0bd822c0e2bd957908fd58f6e99f22ad46b
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 15:05:28 2024 +0800

    fix 获取用户权限设备 优化

commit 41b94fa3a9596a38cda1b4bf4f345ce13fe5677a
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 13:13:23 2024 +0800

    fix  第一

commit aaeacf4ffa778eb6a6104e2349357644d038151b
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 15:05:28 2024 +0800

    fix 获取用户权限设备 优化

commit 9e6099c52d0318cba35e7c082cb4d3085b46b0fa
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 14:00:53 2024 +0800

    fix 营业点配置权限

commit b4565e34f48da0e5ef1d3dffa59d0ccf0d950920
Author: cheche <717840555@qq.com>
Date:   Tue Mar 12 13:13:23 2024 +0800

    fix  第一
2024-03-19 12:07:05 +08:00
e8a98c614c add 补充实体变更 2024-03-19 12:07:05 +08:00
7b83014119 fix 优化菜品保存和分页 2024-03-19 12:06:50 +08:00
c825531fda fix 提交可编译版本 2024-03-19 12:06:26 +08:00
3005443392 feat 菜品/菜单配置 2024-03-19 12:06:26 +08:00
97fb157c9f fix 营业点权限调整 2024-03-19 12:06:26 +08:00
99e1c8f125 fix 实体变更 2024-03-19 12:06:26 +08:00
d327e9e3aa fix 临时修改送餐代码 2024-03-19 12:06:26 +08:00
cheche
8ed8addbf3 fix 表增加ITenantid 2024-03-19 12:06:26 +08:00
068a5b9507 add 补充实体变更 2024-03-18 15:11:56 +08:00
b3b99623e3 fix 优化菜品保存和分页 2024-03-18 13:42:35 +08:00
5fe4104ff6 fix 提交可编译版本 2024-03-18 11:03:43 +08:00
ab406adecf feat 菜品/菜单配置 2024-03-18 10:01:03 +08:00
423d90bf3d fix 营业点权限调整 2024-03-15 20:49:44 +08:00
149660ca0f fix 实体变更 2024-03-15 18:03:09 +08:00
9a84143315 fix 临时修改送餐代码 2024-03-15 16:06:17 +08:00
cheche
255f4b4a13 fix 表增加ITenantid 2024-03-15 15:10:55 +08:00
cheche
69a80f2263 fix 字段修改1 2024-03-15 12:39:43 +08:00
cheche
9fc0719bad feat 配置菜品菜单 2024-03-15 10:40:05 +08:00
7a6bedf3f4 fix 优化任务状态 2024-03-14 20:36:14 +08:00
2cdba175bd fix 优化唯一编码更新问题 2024-03-14 18:50:59 +08:00
89a93d2a69 fix 同步人员控制人事范围 2024-03-14 18:44:04 +08:00
6fcb73f7a9 fix 营业点增加供应商(承包商) 2024-03-14 18:42:46 +08:00
944d9c2291 fix 实体继承处理 2024-03-14 18:30:27 +08:00
cheche
d3a94a4d28 fix 解决合并冲突1 2024-03-14 17:21:46 +08:00
cheche
5be226aef2 fix 字段修改 2024-03-14 17:19:43 +08:00
16be030748 feat 餐补接收 2024-03-14 16:35:38 +08:00
cheche
53dd000f34 feat 菜单订单控制器 2024-03-13 18:55:12 +08:00
cheche
20cf421a3c feat 菜单菜品实体 2024-03-13 14:20:52 +08:00
cheche
3b4b837994 fix 金额变正新增设备名称 2024-03-11 10:31:59 +08:00
64a63e2e49 feat 同步账号 2024-03-10 00:55:51 +08:00
fa408bdcab fix 优化考勤上传 2024-03-09 13:53:12 +08:00
f9a7152c2b fix 优化考勤记录上传 2024-03-09 13:17:40 +08:00
bbd7659320 fix 同步任务调整 2024-03-09 12:13:11 +08:00
27663b4e53 fix 数据类型调整 2024-03-08 16:42:22 +08:00