Commit Graph

766 Commits

Author SHA1 Message Date
SongZhang b81e72a0cc 修改排号卓型不校验nearNum 2024-09-20 11:22:49 +08:00
SongZhang 5c0b87634c Merge remote-tracking branch 'origin/test' into test 2024-09-20 11:13:38 +08:00
SongZhang 948932cb0a 桌型列表isPostpone改为布尔值 2024-09-20 11:12:44 +08:00
wangw 4f89609f07 Merge branch 'ww' into test 2024-09-20 11:00:03 +08:00
wangw 7d5ebbfb65 交班 api/tbHandover/handoverData 2024-09-20 10:59:22 +08:00
SongZhang 4a2fc4e2e0 Merge remote-tracking branch 'origin/test' into test 2024-09-20 09:49:41 +08:00
SongZhang 34c052902a 增加排号卓型添加顺延字段 2024-09-20 09:49:31 +08:00
wangw c020a64469 Merge branch 'ww' into test 2024-09-20 09:28:44 +08:00
wangw 05e1d5390c 规格返回 上下架字段 2024-09-20 09:28:33 +08:00
wangw 6a96987857 Merge branch 'ww' into test 2024-09-20 09:23:57 +08:00
wangw 0f2eea3e13 商品价格范围为空问题 2024-09-20 09:23:45 +08:00
SongZhang 0d06185849 过号发送过号模板消息 2024-09-19 17:51:58 +08:00
SongZhang aded35b3c1 排队叫号添加微信模板消息提醒 2024-09-19 17:46:08 +08:00
SongZhang 395cd4750c 增加小程序模板消息配置 2024-09-19 17:29:16 +08:00
SongZhang 14c437a30e Merge remote-tracking branch 'origin/test' into test 2024-09-19 17:28:18 +08:00
SongZhang 25e45d779d 增加小程序模板消息配置 2024-09-19 17:27:55 +08:00
wangw e56c7c6d81 商品 上下架 2024-09-19 17:13:17 +08:00
wangw f55f709fec 商品 上下架 2024-09-19 17:12:08 +08:00
SongZhang e72cc189da 台桌信息返回当前订单id 2024-09-19 17:05:27 +08:00
SongZhang 9cd49383ff 取号打票 2024-09-19 16:53:51 +08:00
SongZhang e525d7e058 Merge remote-tracking branch 'origin/test' into test 2024-09-19 16:53:38 +08:00
SongZhang 4e76bb2736 代客下单就餐模式判断 2024-09-19 16:53:18 +08:00
wangw f8ac16b457 Merge branch 'ww' into test 2024-09-19 16:06:55 +08:00
wangw df3e3604f2 商品详情 增加关于耗材的 信息
/api/tbProskuCon/V2 新增商品耗材绑定关系
2024-09-19 16:06:30 +08:00
SongZhang d7eaca4af2 Merge remote-tracking branch 'origin/test' into test 2024-09-19 11:14:38 +08:00
SongZhang b4c1743a26 代客下单就餐模式切换接口 2024-09-19 11:14:17 +08:00
wangw 4a6d12f3ad 商品列表 V2 2024-09-19 11:13:18 +08:00
wangw aa880477cb 店铺扩展信息 通过类型查询 title字段 2024-09-19 11:13:18 +08:00
SongZhang a262f6f6b5 代客下单就餐模式切换接口 2024-09-19 10:58:16 +08:00
wangw e4a8991205 商品列表 V2 2024-09-19 10:37:59 +08:00
SongZhang 2f6bbd4dec 挂单报错fix 2024-09-19 10:17:27 +08:00
SongZhang 079bf18d4c 叫号配置接口 2024-09-19 10:16:50 +08:00
SongZhang 66dc7c8581 代客下单 下单根据店铺配置校验餐位费 2024-09-18 17:51:55 +08:00
wangw e4b25899e5 店铺扩展信息 通过类型查询 title字段 2024-09-18 17:32:55 +08:00
SongZhang 1b3158930f 代客下单支持外带用餐模式 2024-09-18 17:29:10 +08:00
SongZhang e9fa13fdd8 排队取号时间格式修改 2024-09-18 11:09:32 +08:00
SongZhang 116ced92cb 排队取号记录修改 2024-09-18 10:38:51 +08:00
SongZhang 510372ff46 排队取号返回叫号信息 2024-09-18 10:31:52 +08:00
SongZhang 1cd6bca4ba 排号修改叫号状态修改 2024-09-18 10:22:32 +08:00
SongZhang d0042e3d63 Merge remote-tracking branch 'origin/test' into test 2024-09-18 10:20:48 +08:00
SongZhang e129be76e8 排号修改叫号状态修改 2024-09-18 10:20:26 +08:00
wangw 5922665e32 店铺扩展信息 通过类型查询 2024-09-18 10:08:02 +08:00
wangw 9fa99a28e3 店铺扩展信息 通过类型查询 2024-09-18 10:07:43 +08:00
SongZhang d0cec6c5ed 排号获取桌型列表fix 2024-09-18 10:01:27 +08:00
SongZhang 5a6d4ce854 Merge remote-tracking branch 'origin/test' into test 2024-09-14 17:22:29 +08:00
SongZhang 04c83a5213 排队桌型列表状态增加筛选 2024-09-14 17:22:09 +08:00
wangw 19a4c0124e Merge branch 'ww' into test 2024-09-14 17:16:49 +08:00
wangw 5215a440c9 去除多余注解
配置 sql日志监听
2024-09-14 17:15:55 +08:00
yijiegong 2abfc01d83 Merge branch 'gyj' into test 2024-09-14 16:59:15 +08:00
yijiegong 35d66973bc 删除注解 2024-09-14 16:58:47 +08:00