谭凯凯
|
eeea82ed43
|
添加商品分组排序方式字段
|
2024-11-12 09:32:42 +08:00 |
|
谭凯凯
|
ff4b651a47
|
添加商品分组排序方式字段
|
2024-11-12 09:31:11 +08:00 |
|
谭凯凯
|
01d4f279aa
|
添加商品分组排序方式字段
|
2024-11-12 09:25:22 +08:00 |
|
谭凯凯
|
5de9575275
|
添加商品分组排序方式字段
|
2024-11-12 09:24:55 +08:00 |
|
谭凯凯
|
756b088f04
|
添加商品分组排序方式字段
|
2024-11-12 09:24:13 +08:00 |
张松
|
dbed5887a1
|
fix: 订单详情增加优惠券抵扣标识
|
2024-11-11 17:28:44 +08:00 |
|
张松
|
bc073414d2
|
fix: 订单详情增加优惠券抵扣标识
|
2024-11-11 17:10:15 +08:00 |
|
张松
|
06d92f7e26
|
fix: 订单列表返回字段修改
|
2024-11-11 16:59:53 +08:00 |
|
张松
|
68261e6185
|
fix: 优惠券使用逻辑修改
|
2024-11-11 16:47:59 +08:00 |
|
张松
|
ddb6573cc0
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-11 16:21:18 +08:00 |
|
张松
|
c4fcf08691
|
fix: 优惠券使用逻辑修改
|
2024-11-11 16:21:06 +08:00 |
|
谭凯凯
|
7be59446f2
|
活动配置新增送积分字段
|
2024-11-11 15:14:21 +08:00 |
|
张松
|
64fd381ed4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-11 14:21:05 +08:00 |
|
张松
|
586bede415
|
fix: 优惠券使用状态不正确修复
|
2024-11-11 14:20:57 +08:00 |
|
张松
|
98ca9d50bc
|
fix: 优惠券使用状态不正确修复
|
2024-11-11 14:19:08 +08:00 |
 wangw
|
99b755f782
|
字段映射问题
|
2024-11-11 14:09:15 +08:00 |
|
张松
|
57f682ab44
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-11 14:07:20 +08:00 |
|
张松
|
c988a95337
|
fix: 优惠券使用状态不正确修复
|
2024-11-11 14:07:08 +08:00 |
GYJ
|
a2106c9176
|
org.springframework.data.domain.Pageable
|
2024-11-09 11:44:53 +08:00 |
|
wangw
|
4f209176e4
|
活动 添加优惠券名称字段
|
2024-11-09 11:05:36 +08:00 |
|
wangw
|
0d5a8b66ca
|
优惠券 来源
|
2024-11-08 18:14:41 +08:00 |
|
wangw
|
5e3caeda30
|
优惠券领取记录
|
2024-11-08 18:01:53 +08:00 |
|
wangw
|
2da48d1c9b
|
Merge branch 'ww-分享' into test
|
2024-11-08 10:16:31 +08:00 |
|
wangw
|
02a2785878
|
邀请记录
|
2024-11-08 10:15:54 +08:00 |
|
Tankaikai
|
0516d443bc
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-08 09:52:45 +08:00 |
|
谭凯凯
|
3b88f464de
|
交班bug修复
|
2024-11-08 09:52:38 +08:00 |
|
张松
|
543bee70f3
|
fix: 会员价根据全局设置校验
|
2024-11-07 16:06:56 +08:00 |
|
张松
|
5ee705cb23
|
fix: 修改会员接口修改
|
2024-11-07 11:32:20 +08:00 |
|
张松
|
82d5ebe687
|
fix: 餐位费校验修改
|
2024-11-07 11:22:02 +08:00 |
|
张松
|
a75164b688
|
fix: 统一退款状态
|
2024-11-07 11:17:33 +08:00 |
|
张松
|
0a519d89b8
|
fix: 修改会员信息校验餐位费修改
|
2024-11-07 11:03:34 +08:00 |
|
张松
|
8e308cf187
|
fix: 修改会员信息校验餐位费修改
|
2024-11-07 10:58:15 +08:00 |
|
张松
|
d912ff5064
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-07 10:24:11 +08:00 |
|
张松
|
ef09658de7
|
fix: 修复客座费没有会员价的情况
|
2024-11-07 10:23:58 +08:00 |
|
wangw
|
66ccea37cd
|
Merge branch 'ww-分享' into test
|
2024-11-07 09:57:58 +08:00 |
|
wangw
|
f567bd821b
|
分享 主键自增
|
2024-11-07 09:57:24 +08:00 |
|
wangw
|
8b885e206e
|
回填
|
2024-11-07 09:55:48 +08:00 |
|
张松
|
e6145311ed
|
fix: 修复打包未计算的问题
|
2024-11-06 17:21:32 +08:00 |
|
张松
|
6c5940c6ea
|
fix: 修复打包未计算的问题
|
2024-11-06 17:18:50 +08:00 |
|
张松
|
77b9b0c409
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-06 17:14:42 +08:00 |
|
张松
|
bd2ed5c8c6
|
fix: 修复打包未计算的问题
|
2024-11-06 17:14:22 +08:00 |
|
wangw
|
7d2965d8b8
|
Merge branch 'ww-分享' into test
|
2024-11-06 17:00:04 +08:00 |
|
wangw
|
7d4788cb3a
|
分享好友模块1
|
2024-11-06 16:57:35 +08:00 |
|
张松
|
f348c8b56f
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-06 16:40:55 +08:00 |
|
张松
|
66331f57dc
|
fix: 取消会员修改
|
2024-11-06 16:40:46 +08:00 |
|
wangw
|
e093606785
|
Merge branch 'ww-分享' into test
|
2024-11-06 16:37:34 +08:00 |
|
wangw
|
b6d3701806
|
分享好友模块
|
2024-11-06 16:36:15 +08:00 |
|
张松
|
12602192de
|
fix: 取消会员修改
|
2024-11-06 16:29:29 +08:00 |
|
张松
|
260aedd6f4
|
fix: 创建订单会员价计算有误修复
|
2024-11-06 16:22:58 +08:00 |
|
张松
|
dc6e739f25
|
Merge remote-tracking branch 'origin/test' into test
|
2024-11-06 16:20:45 +08:00 |
|
张松
|
14a2b5884b
|
fix: 创建订单会员价计算有误修复
|
2024-11-06 16:20:35 +08:00 |
|
谭凯凯
|
920219f978
|
交班bug修复
|
2024-11-06 16:15:01 +08:00 |
|
张松
|
090e5d320e
|
fix: 创建订单会员价计算有误修复
|
2024-11-06 15:36:57 +08:00 |
|
张松
|
8d5642c07a
|
fix: 创建订单会员价计算有误修复
|
2024-11-06 15:35:34 +08:00 |
|
张松
|
5dd35a9572
|
fix: 创建订单会员价计算有误修复
|
2024-11-06 15:28:49 +08:00 |
|
张松
|
1f3f3f1e04
|
fix: 创建订单会员价计算有误修复
|
2024-11-06 15:19:48 +08:00 |
|
张松
|
4ca85ef425
|
fix: 创建订单会员价计算有误修复
|
2024-11-06 15:08:01 +08:00 |
|
张松
|
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 |