Commit Graph

638 Commits

Author SHA1 Message Date
cd4888d900 fix 增加权限控制 2024-03-19 12:06:13 +08:00
1cd9b2467e 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 10:24:41 +08:00
cheche
ed25ab626a fix 返回支付方式中文描述 2024-03-19 09:58:31 +08:00
c4b48131d2 fix 优化送餐 2024-03-18 16:59:45 +08:00
8f26e7e84b fix 参数结构调整 2024-03-18 16:11:45 +08:00
8307d1d941 fix 餐次数据补充 2024-03-18 15:57:18 +08:00
068a5b9507 add 补充实体变更 2024-03-18 15:11:56 +08:00
805f0f83d1 fix 优化查询,增加详情接口 2024-03-18 15:11:38 +08:00
9ef57fba55 fix 枚举code过滤 2024-03-18 15:09:16 +08:00
cheche
0124fa4bc9 fix 获取订餐最晚时间 2024-03-18 14:44:15 +08:00
cheche
fd4a925b4a fix 检验权限修改 2024-03-18 14:21:19 +08:00
cheche
e6dee2d504 fix 解决dishersservice冲突 2024-03-18 14:18:15 +08:00
cheche
2cbf894ea8 fix 修改营业点返回体 2024-03-18 14:17:19 +08:00
b3b99623e3 fix 优化菜品保存和分页 2024-03-18 13:42:35 +08:00
cheche
fcc1f134ed fix currentUser 2024-03-18 12:14:06 +08:00
cheche
253caf26c1 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-18 11:48:41 +08:00
cheche
c743d2d1c5 fix GetDishesMenusBookingResponse修改字段 2024-03-18 11:48:38 +08:00
63ded819c5 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-18 11:03:45 +08:00
5fe4104ff6 fix 提交可编译版本 2024-03-18 11:03:43 +08:00
cheche
3b46ac25a7 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-18 11:01:33 +08:00
cheche
11a3a0aded fix GetDishesMenusBookingSetting返回体修改 2024-03-18 11:01:31 +08:00
a2eca2cdeb fix 增加日期返回 2024-03-18 10:59:52 +08:00
cheche
0bed0bc97b fix 获取营业点下面餐次 2024-03-18 10:54:28 +08:00
c1d84ae1c6 fix 命名空间调整 2024-03-18 10:28:56 +08:00
e2cc31003f fix 更新控制器名称 2024-03-18 10:27:46 +08:00
ab406adecf feat 菜品/菜单配置 2024-03-18 10:01:03 +08:00
6ba2d7d6a2 feat 获取服务时间 2024-03-17 21:26:16 +08:00
6872518b65 fix 处理next空数组 2024-03-17 20:58:11 +08:00
423d90bf3d fix 营业点权限调整 2024-03-15 20:49:44 +08:00
cheche
220ff2d963 fix 修改IBusinessPlacePermissionsService 2024-03-15 18:54:15 +08:00
cheche
72f93a59a6 fix api 2024-03-15 18:47:33 +08:00
149660ca0f fix 实体变更 2024-03-15 18:03:09 +08:00
9a84143315 fix 临时修改送餐代码 2024-03-15 16:06:17 +08:00
328ef5f42c fix 按基地分配获取值错误 2024-03-15 15:13:53 +08:00
ea4a15c44b Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-15 15:13:37 +08:00
cheche
255f4b4a13 fix 表增加ITenantid 2024-03-15 15:10:55 +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