Commit Graph

576 Commits

Author SHA1 Message Date
e78ab0baea fix 增加权限控制 2024-03-19 12:07:05 +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
cheche
153f0ecd2a fix 返回支付方式中文描述 2024-03-19 12:07:05 +08:00
e548c780b8 fix 优化送餐 2024-03-19 12:07:05 +08:00
fa376f7671 fix 参数结构调整 2024-03-19 12:07:05 +08:00
1b58ca69bf fix 餐次数据补充 2024-03-19 12:07:05 +08:00
e8a98c614c add 补充实体变更 2024-03-19 12:07:05 +08:00
4651adedc3 fix 优化查询,增加详情接口 2024-03-19 12:07:05 +08:00
ad48e37273 fix 枚举code过滤 2024-03-19 12:07:05 +08:00
cheche
abf2e2ed29 fix 获取订餐最晚时间 2024-03-19 12:07:05 +08:00
cheche
00869111df fix 检验权限修改 2024-03-19 12:06:50 +08:00
7b83014119 fix 优化菜品保存和分页 2024-03-19 12:06:50 +08:00
cheche
fefc785b66 fix 修改营业点返回体 2024-03-19 12:06:27 +08:00
cheche
3b7874a2a0 fix currentUser 2024-03-19 12:06:26 +08:00
c825531fda fix 提交可编译版本 2024-03-19 12:06:26 +08:00
cheche
8f430bccd3 fix GetDishesMenusBookingResponse修改字段 2024-03-19 12:06:26 +08:00
69c60dc459 fix 增加日期返回 2024-03-19 12:06:26 +08:00
cheche
fadee3861a fix GetDishesMenusBookingSetting返回体修改 2024-03-19 12:06:26 +08:00
cheche
058b989ead fix 获取营业点下面餐次 2024-03-19 12:06:26 +08:00
a82e7ff798 fix 命名空间调整 2024-03-19 12:06:26 +08:00
9acdab4e01 fix 更新控制器名称 2024-03-19 12:06:26 +08:00
3005443392 feat 菜品/菜单配置 2024-03-19 12:06:26 +08:00
a59404711c feat 获取服务时间 2024-03-19 12:06:26 +08:00
ba0fe3e67f fix 处理next空数组 2024-03-19 12:06:26 +08:00
97fb157c9f fix 营业点权限调整 2024-03-19 12:06:26 +08:00
cheche
70420b9668 fix 修改IBusinessPlacePermissionsService 2024-03-19 12:06:26 +08:00
cheche
6f2383c663 fix api 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
4825648e41 fix 按基地分配获取值错误 2024-03-19 12:06:26 +08:00
cheche
8ed8addbf3 fix 表增加ITenantid 2024-03-19 12:06:26 +08:00
a3112eb256 Merge branch 'development' 2024-03-15 13:59:18 +08:00
cheche
7d8f4685ab Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-15 12:39:46 +08:00
cheche
69a80f2263 fix 字段修改1 2024-03-15 12:39:43 +08:00
8a0eb06038 fix 支持多选 2024-03-15 12:15:50 +08:00
1bddd5c90f fix 根节点pno设置为null 2024-03-15 11:59:24 +08:00
cheche
9fc0719bad feat 配置菜品菜单 2024-03-15 10:40:05 +08:00
cheche
1c0ad2edd6 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-15 09:28:11 +08:00
cheche
843662a404 fix 字段修正 2024-03-15 09:28:08 +08:00
ccf8a88a9b fix 调整为调度执行 2024-03-14 21:59:32 +08:00
9fdb2b0159 fix 移除无效字段返回 2024-03-14 21:44:02 +08:00
d3c1b45cf9 fix 取消处理代码位置 2024-03-14 21:29:20 +08:00
f2de9a6526 fix 数据获取需要比较时间 2024-03-14 21:08:28 +08:00
62d54c1f70 fix 逻辑优化 2024-03-14 21:04:45 +08:00
b763e74c12 fix 判断逻辑取反 2024-03-14 20:56:37 +08:00
7da5fdcb2f fix 删除任务设置所有为取消判断 2024-03-14 20:53:56 +08:00
7a6bedf3f4 fix 优化任务状态 2024-03-14 20:36:14 +08:00
efbb72105c fix 聚合swagger 2024-03-14 19:29:30 +08:00
2cdba175bd fix 优化唯一编码更新问题 2024-03-14 18:50:59 +08:00
89a93d2a69 fix 同步人员控制人事范围 2024-03-14 18:44:04 +08:00