张松
|
e0b67cb3cd
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-06 13:52:59 +08:00 |
|
张松
|
5118027b9b
|
feat: 增加详情会员价
|
2024-11-06 13:52:45 +08:00 |
Tankaikai
|
f2ca18953b
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-06 11:26:43 +08:00 |
|
谭凯凯
|
48948eb265
|
供应商出入库记录
|
2024-11-06 11:26:37 +08:00 |
|
张松
|
c2f94d0409
|
feat: 增加详情会员价
|
2024-11-06 11:14:18 +08:00 |
|
张松
|
b2823c5966
|
feat: 优惠券返回名称字段
|
2024-11-06 10:42:32 +08:00 |
|
张松
|
4982d22e5a
|
feat: 优惠券返回名称字段
|
2024-11-06 10:41:18 +08:00 |
|
张松
|
eee972193c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-06 10:21:40 +08:00 |
|
张松
|
de3b435637
|
feat: 增加会员价
|
2024-11-06 10:21:28 +08:00 |
|
Tankaikai
|
a37fd2f9ef
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-06 10:02:00 +08:00 |
|
谭凯凯
|
cd3624027c
|
供应商出入库记录
|
2024-11-06 10:01:54 +08:00 |
 SongZhang
|
b583d01312
|
fix: 优惠券折扣修改
|
2024-11-05 17:07:20 +08:00 |
 wangw
|
648bd55e7a
|
空指针
|
2024-11-05 15:57:04 +08:00 |
|
谭凯凯
|
04f844cf93
|
积分模块相关接口
|
2024-11-05 15:39:48 +08:00 |
|
谭凯凯
|
763be9bc49
|
积分模块相关接口
|
2024-11-05 15:18:17 +08:00 |
|
谭凯凯
|
adb0e978d0
|
积分模块相关接口
|
2024-11-05 15:01:53 +08:00 |
|
谭凯凯
|
029213e068
|
积分模块相关接口
|
2024-11-05 09:39:15 +08:00 |
|
Tankaikai
|
c69cc065a6
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-05 09:31:40 +08:00 |
|
谭凯凯
|
54291604bd
|
积分模块相关接口
|
2024-11-05 09:31:32 +08:00 |
|
wangw
|
5d77e0c3d5
|
多余字段
|
2024-11-04 17:45:45 +08:00 |
|
SongZhang
|
b45709cca1
|
fix: 会员修改接口修改
|
2024-11-04 14:33:33 +08:00 |
|
SongZhang
|
5406aedb76
|
fix: 会员修改接口修改
|
2024-11-04 14:27:41 +08:00 |
|
SongZhang
|
9b1f802867
|
fix: 优惠券查询修改
|
2024-11-04 13:56:19 +08:00 |
|
SongZhang
|
062a0cc2f4
|
fix: 选择会员修改
|
2024-11-04 13:37:20 +08:00 |
|
SongZhang
|
b401f23ec4
|
feat: 新增支付积分优惠券支持
|
2024-11-04 13:26:31 +08:00 |
|
SongZhang
|
7c572d7384
|
feat: 新增支付积分优惠券支持
|
2024-11-04 11:12:27 +08:00 |
|
wangw
|
8aad5da104
|
默认单位
|
2024-11-04 10:53:42 +08:00 |
|
wangw
|
6f6085343f
|
默认单位
|
2024-11-04 10:27:23 +08:00 |
|
SongZhang
|
00e7b35926
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-01 16:54:37 +08:00 |
|
SongZhang
|
086eb3523b
|
1. 订单表修改
|
2024-11-01 16:51:51 +08:00 |
|
wangw
|
cdeb5e003c
|
多余注解
|
2024-11-01 13:46:10 +08:00 |
|
wangw
|
97a8a5472d
|
多余代码删除 环境配置
|
2024-11-01 09:40:03 +08:00 |
|
Tankaikai
|
c07f374ed7
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-31 15:24:39 +08:00 |
|
谭凯凯
|
2e9c25d8a8
|
积分模块相关接口
|
2024-10-31 15:24:33 +08:00 |
|
wangw
|
5eab49b844
|
盘点出入库判断
|
2024-10-31 15:10:56 +08:00 |
|
Tankaikai
|
7691a967b4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-31 14:47:48 +08:00 |
|
谭凯凯
|
362c737c4b
|
积分模块相关接口
|
2024-10-31 14:47:43 +08:00 |
GYJ
|
bfa30e0b72
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-31 14:43:47 +08:00 |
|
GYJ
|
0186055934
|
Merge branch 'refs/heads/dev' into test
|
2024-10-31 14:43:34 +08:00 |
|
GYJ
|
c6aba2caa9
|
台桌统计导出数据处理订单筛选bug
|
2024-10-31 14:42:54 +08:00 |
|
SongZhang
|
1f412710e7
|
1. 取消会员接口修改
|
2024-10-31 14:23:07 +08:00 |
|
SongZhang
|
479a286040
|
1. 取消会员接口修改
|
2024-10-31 14:18:27 +08:00 |
|
SongZhang
|
80d990de17
|
1. 取消会员接口修改
|
2024-10-31 14:17:24 +08:00 |
|
SongZhang
|
f7ca147e49
|
1. 创建订单退款订单状态会被覆盖修复
2. 优惠券积分下单相关实现
|
2024-10-31 14:10:13 +08:00 |
|
GYJ
|
f8797b0e79
|
Merge branch 'refs/heads/dev' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
|
2024-10-31 11:25:14 +08:00 |
|
GYJ
|
5ef762f670
|
台桌统计导出数据处理tableId为null的问题
|
2024-10-31 11:20:00 +08:00 |
|
SongZhang
|
f6b0055bdb
|
fix: 订单列表获取修改
|
2024-10-31 11:12:13 +08:00 |
|
SongZhang
|
d944a9cc82
|
fix: 就餐人数选择修改
|
2024-10-31 10:39:15 +08:00 |
|
SongZhang
|
eaa08bd877
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-31 10:29:45 +08:00 |
|
SongZhang
|
921015488e
|
fix: 退菜修改
|
2024-10-31 10:29:23 +08:00 |