Commit Graph

1173 Commits

Author SHA1 Message Date
SongZhang 1fa1921735 修改会员点单信息 2024-09-29 10:42:32 +08:00
SongZhang 4c56736535 Merge remote-tracking branch 'origin/test' into test 2024-09-29 10:40:52 +08:00
SongZhang 185b50a84e 修改会员点单信息 2024-09-29 10:40:42 +08:00
wangw 45907f107d Merge branch 'ww' into test 2024-09-29 10:30:23 +08:00
wangw bfb9f82659 营业板块 2024-09-29 10:29:55 +08:00
wangw 66c28248b7 Merge branch 'ww' into test 2024-09-29 10:04:28 +08:00
wangw 08f01e04ea 销售趋势柱状图 左下 2024-09-29 10:01:54 +08:00
SongZhang 29d09abd5f 退款相关实现
台桌列表获取报错fix
2024-09-29 09:55:37 +08:00
SongZhang c2ff66d937 Merge remote-tracking branch 'origin/test' into test 2024-09-29 09:55:31 +08:00
SongZhang 2186cd5a04 退款相关实现
台桌列表获取报错fix
2024-09-29 09:55:20 +08:00
Tankaikai 3c5c0f7f47 Merge branch 'tkk' into test 2024-09-29 09:42:03 +08:00
谭凯凯 ae1a748ef2 移除alipayAppId、alipayAppToken 2024-09-29 09:41:31 +08:00
wangw 4e14710e3d Merge branch 'ww' into test 2024-09-29 09:30:39 +08:00
wangw d1d42e8fdf 数据统计 销售趋势 2024-09-29 09:29:01 +08:00
SongZhang ffe39b3113 Merge remote-tracking branch 'origin/test' into test 2024-09-28 16:14:46 +08:00
SongZhang 84acdd0161 选择人数添加锁 2024-09-28 16:14:30 +08:00
wangw e36fb3f55e Merge branch 'ww' into test 2024-09-28 14:56:09 +08:00
wangw 29277ec4eb 报损 返回信息 2024-09-28 14:55:49 +08:00
wangw 7fbabbfeec Merge branch 'ww' into test 2024-09-28 14:43:08 +08:00
wangw dfcd29c738 商品报损 状态码 2024-09-28 14:42:44 +08:00
wangw a8f7d019c9 Merge branch 'ww' into test 2024-09-28 14:13:55 +08:00
wangw 58b25c7e0f 商品报损 2024-09-28 14:13:39 +08:00
wangw d785bd7fa8 Merge branch 'ww' into test 2024-09-28 11:21:29 +08:00
SongZhang a4ce1f0299 票据打印简化 2024-09-28 11:00:13 +08:00
wangw 6973d62dd6 保存库存 报错问题 2024-09-28 10:51:35 +08:00
SongZhang c763257ea0 票据打印简化 2024-09-28 10:45:42 +08:00
SongZhang 083f7fedcb 票据打印简化 2024-09-28 10:40:12 +08:00
SongZhang b1835e370d 删除购物车修改 2024-09-28 09:54:26 +08:00
SongZhang 76264b379a 创建订单修改 2024-09-28 09:45:07 +08:00
SongZhang 70291911a6 加入购物车修改 2024-09-28 09:41:17 +08:00
SongZhang 492fa159b9 加入购物车修改 2024-09-28 09:31:30 +08:00
SongZhang 2eaa98a4bc 加入购物车修改 2024-09-28 09:20:13 +08:00
SongZhang b50e76c04e 加入购物车修改 2024-09-28 09:15:30 +08:00
SongZhang 96f81b1b69 Merge remote-tracking branch 'origin/test' into test 2024-09-27 18:00:42 +08:00
SongZhang f7663fa62c 就餐模式切换修改 2024-09-27 18:00:20 +08:00
Tankaikai c24207bce4 Merge branch 'tkk' into test 2024-09-27 17:53:45 +08:00
谭凯凯 1add18e7dd 店铺管理-店铺列表>三方配置:新增支付宝小程序appid录入项 2024-09-27 17:52:55 +08:00
SongZhang 808e0a43bd Merge remote-tracking branch 'origin/test' into test 2024-09-27 17:42:26 +08:00
SongZhang 723cf01696 获取key报错fix 2024-09-27 17:42:05 +08:00
Tankaikai b1f2d56fa4 Merge remote-tracking branch 'origin/test' into test 2024-09-27 17:33:45 +08:00
Tankaikai 1980c8e88d Merge branch 'tkk' into test 2024-09-27 17:33:15 +08:00
SongZhang 5376962c34 创建订单fix 2024-09-27 17:33:08 +08:00
谭凯凯 cb4fa67e48 店铺管理-店铺列表>三方配置:新增支付宝小程序appid录入项 2024-09-27 17:32:30 +08:00
SongZhang e9e3d8ac80 用餐人数修改 2024-09-27 17:27:04 +08:00
SongZhang 5d665893f2 列表不查询挂单商品 2024-09-27 16:45:44 +08:00
SongZhang ce001560cb 手动清台模式不清空台桌状态 2024-09-27 16:32:49 +08:00
SongZhang 3121ab5adb 查询购物车限制时间 2024-09-27 16:22:09 +08:00
SongZhang 7bd4d05381 Merge remote-tracking branch 'origin/test' into test 2024-09-27 16:08:38 +08:00
SongZhang 8f41aa713c 台桌不返回订单id fix 2024-09-27 16:08:29 +08:00
wangw 51f60c002c Merge branch 'ww' into test 2024-09-27 16:01:55 +08:00