 SongZhang
|
46ec8d47ff
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-23 15:07:03 +08:00 |
|
SongZhang
|
2efd81be50
|
退款校验退款金额
|
2024-10-23 15:06:51 +08:00 |
Tankaikai
|
d9859647b4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-23 14:52:18 +08:00 |
|
谭凯凯
|
42fcd08d00
|
Pad点餐后台配置接口
|
2024-10-23 14:51:21 +08:00 |
 wangw
|
0c7d9a7c7e
|
销量统计 时间筛选
|
2024-10-23 13:47:14 +08:00 |
|
SongZhang
|
82f7bd890e
|
修改订单详情餐位费返回结构
|
2024-10-23 11:12:31 +08:00 |
|
SongZhang
|
4d61647e0d
|
修改订单详情餐位费返回结构
|
2024-10-23 11:11:40 +08:00 |
|
SongZhang
|
f074f45f86
|
多次退款累加退款金额
|
2024-10-23 10:52:55 +08:00 |
|
SongZhang
|
5ce67b4014
|
订单支持多次退款
|
2024-10-23 10:22:40 +08:00 |
|
SongZhang
|
8fe78a48fd
|
霸王餐查询修改接口
|
2024-10-22 17:21:30 +08:00 |
|
wangw
|
94b4954c37
|
店铺配置
店铺装修
|
2024-10-22 15:36:10 +08:00 |
|
SongZhang
|
351b53b432
|
赠送商品打包费不免除
|
2024-10-22 14:39:36 +08:00 |
|
SongZhang
|
c7f68b363e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-22 09:32:08 +08:00 |
|
SongZhang
|
d1c0708526
|
退菜修改
|
2024-10-22 09:31:58 +08:00 |
|
谭凯凯
|
ddc95cf170
|
发送订阅消息增加token
|
2024-10-21 15:42:11 +08:00 |
|
谭凯凯
|
6b4397dec5
|
发送订阅消息增加token
|
2024-10-21 15:38:24 +08:00 |
|
谭凯凯
|
0d79a23ad7
|
发送订阅消息增加token
|
2024-10-21 15:09:20 +08:00 |
|
Tankaikai
|
843408b81e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-21 13:57:03 +08:00 |
|
谭凯凯
|
c5da6f1ca1
|
发送订阅消息增加token
|
2024-10-21 13:56:57 +08:00 |
|
SongZhang
|
844156341c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-21 13:49:49 +08:00 |
|
SongZhang
|
56cf10750d
|
打印报错 fix
|
2024-10-21 13:49:27 +08:00 |
|
谭凯凯
|
af1d4faa03
|
发送订阅消息增加token
|
2024-10-21 11:06:11 +08:00 |
|
谭凯凯
|
7425f0a4d5
|
延迟发送订阅消息
|
2024-10-21 10:42:08 +08:00 |
|
wangw
|
8aa6b1e56b
|
Merge branch 'ww' into test
|
2024-10-21 10:16:13 +08:00 |
|
wangw
|
3dc3605097
|
耗材 虚拟列 不做修改
|
2024-10-21 10:15:36 +08:00 |
|
wangw
|
888821c0e1
|
Merge branch 'ww' into test
|
2024-10-21 09:49:16 +08:00 |
|
wangw
|
4ced0336e4
|
耗材 虚拟列 不做修改
|
2024-10-21 09:48:56 +08:00 |
|
SongZhang
|
b12f6ae823
|
不能取消赠送fix
|
2024-10-18 17:27:06 +08:00 |
|
SongZhang
|
fcaf1f230b
|
订单列表支持订单号和商品名模糊查询
|
2024-10-18 17:18:39 +08:00 |
|
wangw
|
b589faefab
|
Merge branch 'ww' into test
|
2024-10-18 16:36:43 +08:00 |
|
wangw
|
29292c54ed
|
耗材列表 排序
|
2024-10-18 16:36:06 +08:00 |
|
SongZhang
|
87de3f891e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-18 15:57:39 +08:00 |
|
SongZhang
|
e5224d6bc6
|
退菜后订单金额不对修复
|
2024-10-18 15:57:29 +08:00 |
|
wangw
|
45cf1afa48
|
Merge branch 'ww' into test
|
2024-10-18 15:29:28 +08:00 |
|
wangw
|
8b49d17982
|
员工账号校验
耗材出入库 备注
|
2024-10-18 15:29:00 +08:00 |
|
wangw
|
9129a114df
|
Merge branch 'ww' into test
|
2024-10-18 13:31:41 +08:00 |
|
wangw
|
31e21e4705
|
耗材 多余内容删除
|
2024-10-18 13:31:17 +08:00 |
|
wangw
|
0dcc46d00d
|
Merge branch 'ww' into test
|
2024-10-17 10:42:45 +08:00 |
|
wangw
|
312c9cc1be
|
耗材列表 关联 商品
|
2024-10-17 10:42:12 +08:00 |
|
wangw
|
973796f491
|
Merge branch 'ww' into test
|
2024-10-17 10:17:32 +08:00 |
|
wangw
|
0f7502df06
|
耗材列表
|
2024-10-17 10:17:06 +08:00 |
|
wangw
|
dc9859b31d
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
|
2024-10-17 09:57:59 +08:00 |
|
wangw
|
30f21e1dd3
|
排序
|
2024-10-17 09:56:38 +08:00 |
|
SongZhang
|
e2a127c0d0
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-17 09:13:18 +08:00 |
|
SongZhang
|
519bedfc7c
|
detail价格计算折扣
|
2024-10-17 09:12:58 +08:00 |
|
wangw
|
d79f737665
|
耗材列表
|
2024-10-16 17:56:04 +08:00 |
|
wangw
|
e04281d8b9
|
耗材列表
|
2024-10-16 17:54:16 +08:00 |
|
SongZhang
|
eff2d6d630
|
购物车修改接口 fix
|
2024-10-16 15:22:32 +08:00 |
|
SongZhang
|
54acf2a0f5
|
打包赠送允许不传递值
|
2024-10-16 15:11:53 +08:00 |
|
SongZhang
|
483af5462d
|
购物车获取修改
|
2024-10-16 14:27:27 +08:00 |