|
|
921015488e
|
fix: 退菜修改
|
2024-10-31 10:29:23 +08:00 |
|
Tankaikai
|
758e556975
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-31 10:28:53 +08:00 |
|
谭凯凯
|
8888c13083
|
积分模块相关接口
|
2024-10-31 10:28:47 +08:00 |
|
|
|
34460c0f0d
|
fix: 退菜修改
|
2024-10-31 10:15:58 +08:00 |
|
|
|
a9ea2cdc82
|
fix: 退菜修改
|
2024-10-31 10:01:26 +08:00 |
|
|
|
ce93f7593d
|
fix: 退菜修改
|
2024-10-31 09:55:16 +08:00 |
|
|
|
ec3d76f73d
|
fix: 退菜修改
|
2024-10-31 09:34:22 +08:00 |
|
GYJ
|
c717d0f2c2
|
Merge branch 'refs/heads/gyj' into dev
|
2024-10-31 09:34:11 +08:00 |
|
GYJ
|
b17636abbe
|
台桌统计数据导出修改
|
2024-10-31 09:33:01 +08:00 |
|
|
|
05dc070107
|
fix: 创建订单取餐码增加修复
|
2024-10-31 09:30:05 +08:00 |
|
|
|
1017b69a89
|
fix: 订单详情返回客座费信息
|
2024-10-30 18:28:41 +08:00 |
|
|
|
b363044282
|
fix: 退款修改
|
2024-10-30 18:06:48 +08:00 |
|
|
|
c1145538dc
|
fix: 下单次数修复
|
2024-10-30 18:01:29 +08:00 |
|
|
|
31f20090e5
|
fix: 选择会员保存会员相关信息
|
2024-10-30 17:59:52 +08:00 |
|
|
|
6630141a99
|
fix: 选择会员保存会员相关信息
|
2024-10-30 17:48:24 +08:00 |
|
|
|
09872cd71b
|
Merge branch 'refs/heads/dev' into test
|
2024-10-30 17:25:11 +08:00 |
|
|
|
d21833b4b2
|
fix: 修改购物车修改
|
2024-10-30 17:24:39 +08:00 |
|
|
|
f386405aaa
|
fix: 外带下单次数修复
|
2024-10-30 17:11:39 +08:00 |
|
|
|
a8d59c1308
|
Merge branch 'refs/heads/dev' into test
|
2024-10-30 17:06:36 +08:00 |
|
|
|
07990a0a96
|
fix: 打包赠送修改
|
2024-10-30 17:06:13 +08:00 |
|
|
|
b80ad45a1b
|
Merge branch 'refs/heads/dev' into test
|
2024-10-30 17:01:23 +08:00 |
|
|
|
bae22532d1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-30 16:59:05 +08:00 |
|
|
|
bd08205426
|
fix: 打包赠送修改
|
2024-10-30 16:58:45 +08:00 |
|
|
|
b4e5eda9f7
|
fix: 获取购物车修改
|
2024-10-30 16:04:15 +08:00 |
|
|
|
8ef801afa1
|
fix: 获取购物车修改
|
2024-10-30 16:00:46 +08:00 |
|
|
|
93845145f3
|
fix: 修复无台桌切换就餐模式购物车丢失
|
2024-10-30 15:51:45 +08:00 |
|
|
|
b5b1ad8b18
|
副单位
|
2024-10-30 15:25:36 +08:00 |
|
|
|
40b63bff4d
|
副单位
|
2024-10-30 15:24:43 +08:00 |
|
|
|
dcfb79c87a
|
耗材库存记录列表 默认值
|
2024-10-30 15:11:38 +08:00 |
|
|
|
019bf55598
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-30 15:04:39 +08:00 |
|
|
|
7c1415663d
|
fix: 修复无台桌切换就餐模式购物车丢失
|
2024-10-30 15:04:17 +08:00 |
|
|
|
5cb7e9bdfb
|
销售统计 效率优化
|
2024-10-30 14:52:52 +08:00 |
|
|
|
b2a7ea1887
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-30 14:41:05 +08:00 |
|
|
|
5a90bfe202
|
Merge branch 'refs/heads/dev' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
|
2024-10-30 14:40:54 +08:00 |
|
|
|
8bb27ab292
|
fix: 订单列表接口返回就餐类型字段
|
2024-10-30 14:18:01 +08:00 |
|
|
|
3f0329a7c5
|
fix: 无台桌退菜实现
|
2024-10-30 14:04:06 +08:00 |
|
|
|
6ec1e0ef7d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-29 17:19:07 +08:00 |
|
|
|
9d23c4d337
|
fix: 订单过期结束购物车状态
|
2024-10-29 17:18:58 +08:00 |
|
Tankaikai
|
3a00b85a02
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-29 16:06:48 +08:00 |
|
谭凯凯
|
d5b0813c46
|
会员余额支付缺陷修复
|
2024-10-29 15:47:09 +08:00 |
|
谭凯凯
|
17cbff4228
|
会员余额支付缺陷修复
|
2024-10-29 15:16:34 +08:00 |
|
Tankaikai
|
a11cb5eea5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-29 15:12:11 +08:00 |
|
|
|
d978abc2e1
|
Merge branch 'refs/heads/dev' into test
|
2024-10-29 15:11:00 +08:00 |
|
|
|
04fab9ef26
|
fix: 修稿储值卡支付保存的用户id和店铺会员id
|
2024-10-29 15:10:46 +08:00 |
|
|
|
ad8c87d313
|
fix: 退款金额不准确修复
|
2024-10-29 15:02:21 +08:00 |
|
|
|
b94760f6f5
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-10-29 15:01:49 +08:00 |
|
|
|
46be2c0f63
|
fix: 退款金额不准确修复
|
2024-10-29 14:54:52 +08:00 |
|
|
|
0afdccaa9e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-29 14:37:38 +08:00 |
|
|
|
e79e527bfd
|
Merge branch 'refs/heads/dev' into test
|
2024-10-29 14:37:22 +08:00 |
|
|
|
ecfe7dc128
|
Merge branch 'gyj' into test
|
2024-10-29 14:12:24 +08:00 |
|
