Commit Graph

Select branches

Hide Pull Requests

master

yuenan

Mono Color

• 84398a566e Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-03-19 15:26:42 +08:00
• 217d9f7770 feat 配送点管理 cheche 2024-03-19 15:26:40 +08:00
• 84b402538e fix 菜单分页响应调整,增加详情接口 liguoyang 2024-03-19 14:59:21 +08:00
• 098d7c7e9d fix 代码优化 liguoyang 2024-03-19 14:26:24 +08:00
• 15d98356ae Merge branch 'development' liguoyang 2024-03-19 13:51:30 +08:00
• 2bbf2862fe fix Guid nullable问题 liguoyang 2024-03-19 13:51:13 +08:00
• 192a770a75 Merge branch 'development' liguoyang 2024-03-19 12:41:18 +08:00
• 85220f87b8 fix cancelid默认值 liguoyang 2024-03-19 12:40:49 +08:00
• b23c674c6e Squashed commit of the following: liguoyang 2024-03-19 12:09:50 +08:00
• ee0ee9b167 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development liguoyang 2024-03-19 12:07:22 +08:00
• e78ab0baea fix 增加权限控制 liguoyang 2024-03-19 12:06:13 +08:00
• 793a3325f2 Squashed commit of the following: liguoyang 2024-03-19 10:24:41 +08:00
• 153f0ecd2a fix 返回支付方式中文描述 cheche 2024-03-19 09:58:31 +08:00
• e548c780b8 fix 优化送餐 liguoyang 2024-03-18 16:59:45 +08:00
• fa376f7671 fix 参数结构调整 liguoyang 2024-03-18 16:11:45 +08:00
• 1b58ca69bf fix 餐次数据补充 liguoyang 2024-03-18 15:57:18 +08:00
• e8a98c614c add 补充实体变更 liguoyang 2024-03-18 15:11:56 +08:00
• 4651adedc3 fix 优化查询,增加详情接口 liguoyang 2024-03-18 15:11:38 +08:00
• ad48e37273 fix 枚举code过滤 liguoyang 2024-03-18 15:09:16 +08:00
• abf2e2ed29 fix 获取订餐最晚时间 cheche 2024-03-18 14:44:15 +08:00
• 00869111df fix 检验权限修改 cheche 2024-03-18 14:21:19 +08:00
• 7b83014119 fix 优化菜品保存和分页 liguoyang 2024-03-18 13:42:35 +08:00
• fefc785b66 fix 修改营业点返回体 cheche 2024-03-18 14:17:19 +08:00
• 3b7874a2a0 fix currentUser cheche 2024-03-18 12:14:06 +08:00
• c825531fda fix 提交可编译版本 liguoyang 2024-03-18 11:03:43 +08:00
• 8f430bccd3 fix GetDishesMenusBookingResponse修改字段 cheche 2024-03-18 11:48:38 +08:00
• 69c60dc459 fix 增加日期返回 liguoyang 2024-03-18 10:59:52 +08:00
• fadee3861a fix GetDishesMenusBookingSetting返回体修改 cheche 2024-03-18 11:01:31 +08:00
• 058b989ead fix 获取营业点下面餐次 cheche 2024-03-18 10:54:28 +08:00
• a82e7ff798 fix 命名空间调整 liguoyang 2024-03-18 10:28:56 +08:00
• 9acdab4e01 fix 更新控制器名称 liguoyang 2024-03-18 10:27:46 +08:00
• 3005443392 feat 菜品/菜单配置 liguoyang 2024-03-18 10:01:03 +08:00
• a59404711c feat 获取服务时间 liguoyang 2024-03-17 21:26:16 +08:00
• ba0fe3e67f fix 处理next空数组 liguoyang 2024-03-17 20:58:11 +08:00
• 97fb157c9f fix 营业点权限调整 liguoyang 2024-03-15 20:49:44 +08:00
• 70420b9668 fix 修改IBusinessPlacePermissionsService cheche 2024-03-15 18:54:15 +08:00
• 6f2383c663 fix api cheche 2024-03-15 18:47:33 +08:00
• 99e1c8f125 fix 实体变更 liguoyang 2024-03-15 18:03:09 +08:00
• d327e9e3aa fix 临时修改送餐代码 liguoyang 2024-03-15 16:06:17 +08:00
• 4825648e41 fix 按基地分配获取值错误 liguoyang 2024-03-15 15:13:53 +08:00
• 8ed8addbf3 fix 表增加ITenantid cheche 2024-03-15 15:10:55 +08:00
• cd4888d900 fix 增加权限控制 liguoyang 2024-03-19 12:06:13 +08:00
• 1cd9b2467e Squashed commit of the following: liguoyang 2024-03-19 10:24:41 +08:00
• ed25ab626a fix 返回支付方式中文描述 cheche 2024-03-19 09:58:31 +08:00
• c4b48131d2 fix 优化送餐 liguoyang 2024-03-18 16:59:45 +08:00
• 8f26e7e84b fix 参数结构调整 liguoyang 2024-03-18 16:11:45 +08:00
• 8307d1d941 fix 餐次数据补充 liguoyang 2024-03-18 15:57:18 +08:00
• 068a5b9507 add 补充实体变更 liguoyang 2024-03-18 15:11:56 +08:00
• 805f0f83d1 fix 优化查询,增加详情接口 liguoyang 2024-03-18 15:11:38 +08:00
• 9ef57fba55 fix 枚举code过滤 liguoyang 2024-03-18 15:09:16 +08:00
• 0124fa4bc9 fix 获取订餐最晚时间 cheche 2024-03-18 14:44:15 +08:00
• fd4a925b4a fix 检验权限修改 cheche 2024-03-18 14:21:19 +08:00
• e6dee2d504 fix 解决dishersservice冲突 cheche 2024-03-18 14:18:15 +08:00
• 2cbf894ea8 fix 修改营业点返回体 cheche 2024-03-18 14:17:19 +08:00
• b3b99623e3 fix 优化菜品保存和分页 liguoyang 2024-03-18 13:42:35 +08:00
• fcc1f134ed fix currentUser cheche 2024-03-18 12:14:06 +08:00
• 253caf26c1 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-03-18 11:48:41 +08:00
• c743d2d1c5 fix GetDishesMenusBookingResponse修改字段 cheche 2024-03-18 11:48:38 +08:00
• 63ded819c5 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development liguoyang 2024-03-18 11:03:45 +08:00
• 5fe4104ff6 fix 提交可编译版本 liguoyang 2024-03-18 11:03:43 +08:00
• 3b46ac25a7 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-03-18 11:01:33 +08:00
• 11a3a0aded fix GetDishesMenusBookingSetting返回体修改 cheche 2024-03-18 11:01:31 +08:00
• a2eca2cdeb fix 增加日期返回 liguoyang 2024-03-18 10:59:52 +08:00
• 0bed0bc97b fix 获取营业点下面餐次 cheche 2024-03-18 10:54:28 +08:00
• c1d84ae1c6 fix 命名空间调整 liguoyang 2024-03-18 10:28:56 +08:00
• e2cc31003f fix 更新控制器名称 liguoyang 2024-03-18 10:27:46 +08:00
• ab406adecf feat 菜品/菜单配置 liguoyang 2024-03-18 10:01:03 +08:00
• 6ba2d7d6a2 feat 获取服务时间 liguoyang 2024-03-17 21:26:16 +08:00
• 6872518b65 fix 处理next空数组 liguoyang 2024-03-17 20:58:11 +08:00
• 423d90bf3d fix 营业点权限调整 liguoyang 2024-03-15 20:49:44 +08:00
• 220ff2d963 fix 修改IBusinessPlacePermissionsService cheche 2024-03-15 18:54:15 +08:00
• 72f93a59a6 fix api cheche 2024-03-15 18:47:33 +08:00
• 149660ca0f fix 实体变更 liguoyang 2024-03-15 18:03:09 +08:00
• 9a84143315 fix 临时修改送餐代码 liguoyang 2024-03-15 16:06:17 +08:00
• 328ef5f42c fix 按基地分配获取值错误 liguoyang 2024-03-15 15:13:53 +08:00
• ea4a15c44b Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development liguoyang 2024-03-15 15:13:37 +08:00
• 255f4b4a13 fix 表增加ITenantid cheche 2024-03-15 15:10:55 +08:00
• a3112eb256 Merge branch 'development' liguoyang 2024-03-15 13:59:18 +08:00
• 7d8f4685ab Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-03-15 12:39:46 +08:00
• 69a80f2263 fix 字段修改1 cheche 2024-03-15 12:39:43 +08:00
• 8a0eb06038 fix 支持多选 liguoyang 2024-03-15 12:15:50 +08:00
• 1bddd5c90f fix 根节点pno设置为null liguoyang 2024-03-15 11:59:24 +08:00
• 9fc0719bad feat 配置菜品菜单 cheche 2024-03-15 10:40:05 +08:00
• 1c0ad2edd6 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-03-15 09:28:11 +08:00
• 843662a404 fix 字段修正 cheche 2024-03-15 09:28:08 +08:00
• ccf8a88a9b fix 调整为调度执行 liguoyang 2024-03-14 21:59:32 +08:00
• 9fdb2b0159 fix 移除无效字段返回 liguoyang 2024-03-14 21:44:02 +08:00
• d3c1b45cf9 fix 取消处理代码位置 liguoyang 2024-03-14 21:29:20 +08:00
• f2de9a6526 fix 数据获取需要比较时间 liguoyang 2024-03-14 21:08:28 +08:00
• 62d54c1f70 fix 逻辑优化 liguoyang 2024-03-14 21:04:45 +08:00
• b763e74c12 fix 判断逻辑取反 liguoyang 2024-03-14 20:56:37 +08:00
• 7da5fdcb2f fix 删除任务设置所有为取消判断 liguoyang 2024-03-14 20:53:56 +08:00
• 7a6bedf3f4 fix 优化任务状态 liguoyang 2024-03-14 20:36:14 +08:00
• efbb72105c fix 聚合swagger liguoyang 2024-03-14 19:29:30 +08:00
• 2cdba175bd fix 优化唯一编码更新问题 liguoyang 2024-03-14 18:50:59 +08:00
• 89a93d2a69 fix 同步人员控制人事范围 liguoyang 2024-03-14 18:44:04 +08:00
• 6fcb73f7a9 fix 营业点增加供应商(承包商) liguoyang 2024-03-14 18:42:46 +08:00
• 944d9c2291 fix 实体继承处理 liguoyang 2024-03-14 18:30:27 +08:00
• d3a94a4d28 fix 解决合并冲突1 cheche 2024-03-14 17:21:46 +08:00
• 5be226aef2 fix 字段修改 cheche 2024-03-14 17:19:43 +08:00