Commit Graph

665 Commits

Author SHA1 Message Date
89904fead1 fix 菜单时效范围 2024-03-21 20:23:20 +08:00
573911f907 fix 订单聚合返回状态 2024-03-21 19:13:33 +08:00
93c38be18a fix 订单查询 2024-03-21 18:40:12 +08:00
e256d18d36 fix 订单取消接口,分页权限控制 2024-03-21 18:14:33 +08:00
1218aec811 fix 营业点权限控制优化 2024-03-21 17:32:45 +08:00
226c61ee41 fix tenantId赋值 2024-03-21 17:09:42 +08:00
28d2c1d8d4 fix ignoretenant 2024-03-21 17:05:37 +08:00
5ae6dd97b4 fix ignoretenant 2024-03-21 16:53:40 +08:00
4c866eaf3f feat 获取所有地址 2024-03-21 16:40:24 +08:00
2ca8f2db49 fix 优化查询 2024-03-21 16:22:47 +08:00
212a1fa073 fix 临时数据模拟 2024-03-21 16:01:49 +08:00
0eb76e878c fix 处理删除缺少判断 2024-03-21 15:48:59 +08:00
c582fb40c0 fix 查询优化 2024-03-21 15:40:22 +08:00
6d3a19b283 fix 错误值修改 2024-03-21 11:48:45 +08:00
c39f77008d fix 营业点控制(admin),unit返回 2024-03-21 11:31:50 +08:00
a5dcab1d07 fix 营业点分页控制 2024-03-21 11:16:23 +08:00
02084be82b fix 分类控制菜品获取 2024-03-21 11:01:14 +08:00
96c5c5feba fix DI 2024-03-21 10:39:58 +08:00
367ede2eeb fix 订餐返回当前信息,增加数量入参和响应 2024-03-21 10:35:24 +08:00
0e1f6cb4a0 fix 餐补查询代码调整 2024-03-20 16:40:10 +08:00
21fc2f78d3 fix 支付批量操作 2024-03-20 15:52:46 +08:00
cheche
878b44a146 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-20 15:27:39 +08:00
cheche
a90d4e66a7 fix 餐补查询及日志删除 2024-03-20 15:27:37 +08:00
bf5c937037 fix 补充营业点分配权限接口 2024-03-20 15:12:30 +08:00
07672f1d32 fix 优化changeDb 2024-03-20 13:56:33 +08:00
7090ee4a33 fix 敏感信息混淆 2024-03-20 13:41:25 +08:00
4366b68831 fix 代码优化 2024-03-20 12:42:48 +08:00
03b73515b5 fix tree返回营业点 2024-03-20 10:59:08 +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
f427338715 feat 获取菜品 2024-03-19 18:43:19 +08:00
cheche
3a65d95701 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-19 18:36:16 +08:00
cheche
9a7091b4e0 fix 删除日志try 2024-03-19 18:36:14 +08:00
7432fae103 fix 配送点增加 2024-03-19 18:02:31 +08:00
ecd162c7af fix 预定就餐送货地点 2024-03-19 17:51:15 +08:00
1c7a054ed4 feat 获取所有营业点接口 2024-03-19 15:53:22 +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
2bbf2862fe fix Guid nullable问题 2024-03-19 13:51:13 +08:00
85220f87b8 fix cancelid默认值 2024-03-19 12:40:49 +08:00
ee0ee9b167 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-19 12:07:22 +08:00
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