|
|
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 |
|
|
|
4651adedc3
|
fix 优化查询,增加详情接口
|
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 |
|
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 |
|
|
|
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 |
|
|
|
4825648e41
|
fix 按基地分配获取值错误
|
2024-03-19 12:06:26 +08:00 |
|
|
|
a3112eb256
|
Merge branch 'development'
|
2024-03-15 13:59:18 +08:00 |
|
|
|
1bddd5c90f
|
fix 根节点pno设置为null
|
2024-03-15 11:59:24 +08:00 |
|
|
|
ccf8a88a9b
|
fix 调整为调度执行
|
2024-03-14 21:59:32 +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 |
|
|
|
2cdba175bd
|
fix 优化唯一编码更新问题
|
2024-03-14 18:50:59 +08:00 |
|
|
|
6fcb73f7a9
|
fix 营业点增加供应商(承包商)
|
2024-03-14 18:42:46 +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 |
|
|
|
d17b20365a
|
fix 查询取消异常抛出
|
2024-03-14 15:46:08 +08:00 |
|
|
|
87a386a3d7
|
fix 入参取消Array
|
2024-03-13 20:17:48 +08:00 |
|
cheche
|
6e36cad158
|
fix 获取用户权限设备提醒优化
|
2024-03-12 16:02:19 +08:00 |
|
|
|
80aa3f6932
|
feat 数据迁移接口
|
2024-03-12 12:45:25 +08:00 |
|
cheche
|
1dbc1459ea
|
Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development
|
2024-03-12 11:08:30 +08:00 |
|
cheche
|
e7aa353dce
|
fix 营业点配置设备优化
|
2024-03-12 11:08:28 +08:00 |
|
|
|
f7f6a8686f
|
Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development
|
2024-03-12 10:51:23 +08:00 |
|
|
|
a5f80a0ef4
|
fix 统计人数调整,移除无用接口
|
2024-03-12 10:51:19 +08:00 |
|
cheche
|
f53ca84776
|
fix 营业点配置设备位置移动
|
2024-03-12 10:51:10 +08:00 |
|
cheche
|
7bf97dbe5e
|
fix 根据档案号 设备组查询设备优化
|
2024-03-12 10:34:31 +08:00 |
|
cheche
|
5684078071
|
feat 获取用户所有设备权限
|
2024-03-11 18:37:42 +08:00 |
|
|
|
59122c408f
|
fix 根据档案号,设备组查询设备
|
2024-03-11 18:04:00 +08:00 |
|
cheche
|
90e5728fd3
|
feat aa
|
2024-03-11 17:48:47 +08:00 |
|
