 SongZhang
|
10f17d521e
|
支付回调测试
|
2024-10-08 17:15:41 +08:00 |
|
SongZhang
|
b9cce3bdf1
|
挂起订单取消挂起失败fix
|
2024-10-08 15:20:43 +08:00 |
|
SongZhang
|
e7ca92eaaf
|
排队取号，取号完成无法取号fix
|
2024-10-08 14:36:45 +08:00 |
|
SongZhang
|
780fce1416
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-08 14:28:12 +08:00 |
|
SongZhang
|
79d15b5c4e
|
修改全局参数校验异常处理器逻辑
|
2024-10-08 14:28:02 +08:00 |
 yijiegong
|
81dce3ea75
|
Merge branch 'gyj' into test
|
2024-10-08 13:50:02 +08:00 |
|
yijiegong
|
58a74d1b29
|
conInfoId 字段名
|
2024-10-08 13:49:26 +08:00 |
 wangw
|
facfa94973
|
库存警戒值
|
2024-10-08 13:43:02 +08:00 |
|
wangw
|
3c2f705bbb
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
|
2024-10-08 13:41:18 +08:00 |
|
wangw
|
ca3b16c677
|
库存警戒值
|
2024-10-08 13:34:05 +08:00 |
|
wangw
|
8c69aa7474
|
Merge branch 'ww' into test
|
2024-10-08 13:25:18 +08:00 |
|
wangw
|
869d14f158
|
商品编辑 修改状态日志记录
快捷修改接口 日志记录 商品Id
库存警戒值
/api/summary/productSaleDate 商品销售 时间顺序
|
2024-10-08 13:24:03 +08:00 |
|
SongZhang
|
f703a40903
|
退款接口实现
|
2024-10-08 10:55:08 +08:00 |
|
SongZhang
|
fbb2be3755
|
退款接口实现
|
2024-10-08 10:51:24 +08:00 |
|
SongZhang
|
27f489fb0f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-08 10:39:42 +08:00 |
|
SongZhang
|
f3539d1899
|
退款接口实现
|
2024-10-08 10:39:31 +08:00 |
|
yijiegong
|
88b649ab42
|
Merge branch 'gyj' into test
|
2024-10-08 10:30:20 +08:00 |
|
yijiegong
|
cd1e953583
|
删除 多余 gitignore
|
2024-10-08 10:29:49 +08:00 |
|
SongZhang
|
ba9482c4f6
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-08 09:27:03 +08:00 |
|
SongZhang
|
21a8fd517e
|
微信扫码支付报错fix
|
2024-10-08 09:26:44 +08:00 |
|
wangw
|
e838459a1b
|
Merge branch 'ww' into test
|
2024-09-29 17:52:45 +08:00 |
|
wangw
|
f16f23ab84
|
商品 餐位费 不计
|
2024-09-29 17:52:19 +08:00 |
|
SongZhang
|
79e99e78a5
|
修改购物车修改
|
2024-09-29 11:40:31 +08:00 |
|
SongZhang
|
4ae309b5c5
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-29 11:35:35 +08:00 |
|
SongZhang
|
655383fd02
|
退款接口
|
2024-09-29 11:35:22 +08:00 |
|
wangw
|
07c9cb349d
|
Merge branch 'ww' into test
|
2024-09-29 10:59:30 +08:00 |
|
wangw
|
e28cb5d1f5
|
营业板块 翻台率
|
2024-09-29 10:57:27 +08:00 |
|
SongZhang
|
c5d68ffffc
|
修改会员点单信息
|
2024-09-29 10:51:10 +08:00 |
|
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 |