|
|
b9157ddc6b
|
Merge branch 'ww' into test
|
2024-08-20 14:58:12 +08:00 |
|
|
|
1cb0d9c80f
|
会员活动赠送商品
|
2024-08-20 14:57:55 +08:00 |
|
|
|
830271a838
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-20 14:47:50 +08:00 |
|
|
|
b388b3a044
|
1.库存排序
|
2024-08-20 14:47:32 +08:00 |
|
牛叉闪闪
|
049f52499e
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-20 14:46:52 +08:00 |
|
牛叉闪闪
|
d6b8919294
|
修改增加减少用户资金接口
|
2024-08-20 14:46:12 +08:00 |
|
|
|
fcfe0a2f53
|
1.库存排序
|
2024-08-20 14:39:01 +08:00 |
|
|
|
a90c441988
|
Merge remote-tracking branch 'origin/test' into zs
|
2024-08-19 17:45:09 +08:00 |
|
|
|
d6bbe73d58
|
1.代客下单 会员点单 取消点单
|
2024-08-19 17:42:47 +08:00 |
|
牛叉闪闪
|
2567044da8
|
添加是否允许会员自定义金额字段
|
2024-08-19 17:41:25 +08:00 |
|
|
|
15de68b704
|
1.代客下单 会员点单 取消点单
|
2024-08-19 16:24:45 +08:00 |
|
|
|
2252f4edcb
|
Merge remote-tracking branch 'origin/test' into zs
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
|
2024-08-19 16:15:52 +08:00 |
|
|
|
ea86b42847
|
1.代客下单 会员点单 取消点单
|
2024-08-19 16:15:01 +08:00 |
|
GYJ
|
53275cd5de
|
集成model类型修改
|
2024-08-19 16:09:44 +08:00 |
|
|
|
b5fc56c0aa
|
1.代客下单 挂单规格返回
|
2024-08-19 15:43:11 +08:00 |
|
|
|
a74612f5a6
|
1.代客下单 桌号获取
|
2024-08-19 14:12:07 +08:00 |
|
牛叉闪闪
|
95e37c2048
|
添加增加减少会员余额接口
|
2024-08-19 11:25:01 +08:00 |
|
牛叉闪闪
|
e35cb8ad3c
|
Merge remote-tracking branch 'origin/hph' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopUserController.java
|
2024-08-19 11:24:22 +08:00 |
|
牛叉闪闪
|
635625842a
|
添加增加减少会员余额接口
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
53fd7e24c0
|
判断修改耗材参数
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
cf62b77128
|
添加耗材信息单价字段
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
58eb528047
|
添加耗材信息单价字段
|
2024-08-19 11:23:59 +08:00 |
|
|
|
4909ebe807
|
1.代客下单 删除订单接口
|
2024-08-19 11:23:59 +08:00 |
|
牛叉闪闪
|
fa868cce31
|
添加耗材信息单价字段
|
2024-08-19 11:23:59 +08:00 |
|
|
|
5f2950ab72
|
1.代客下单挂单修改
|
2024-08-19 11:23:58 +08:00 |
|
|
|
8da97add53
|
1.商品不推送修复
|
2024-08-19 11:23:58 +08:00 |
|
|
|
2250bda5c1
|
分组时间管控
|
2024-08-19 11:23:58 +08:00 |
|
|
|
e3f68dc486
|
用户管理 排序
|
2024-08-19 11:23:58 +08:00 |
|
|
|
ff07ab528e
|
活动管理 赠送商品
|
2024-08-19 11:23:58 +08:00 |
|
|
|
0ec21c31e9
|
1.代客下单 挂起订单
|
2024-08-19 11:23:58 +08:00 |
|
|
|
8d73b216ef
|
1.代客下单 挂起订单
|
2024-08-19 11:23:58 +08:00 |
|
牛叉闪闪
|
2ad3ca3ef8
|
添加增加减少会员余额接口
|
2024-08-19 11:23:32 +08:00 |
|
牛叉闪闪
|
341b54bd6b
|
Merge remote-tracking branch 'origin/test' into hph
|
2024-08-19 11:22:34 +08:00 |
|
牛叉闪闪
|
89810ae9b9
|
添加增加减少会员余额接口
|
2024-08-19 11:20:58 +08:00 |
|
GYJ
|
5643faab22
|
弹窗广告
|
2024-08-19 11:16:47 +08:00 |
|
|
|
c51e0ec580
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-19 10:12:02 +08:00 |
|
|
|
96f1dcb768
|
1.代客下单 删除订单接口
|
2024-08-19 10:11:51 +08:00 |
|
牛叉闪闪
|
9f6f7c2a78
|
判断修改耗材参数
|
2024-08-19 09:45:48 +08:00 |
|
GYJ
|
e1499150f9
|
修改库存开关导致数据缺失的问题
|
2024-08-18 20:24:26 +08:00 |
|
GYJ
|
e6b8414366
|
Merge branch 'refs/heads/test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
|
2024-08-18 20:14:25 +08:00 |
|
牛叉闪闪
|
085ae733e2
|
添加耗材信息单价字段
|
2024-08-17 18:33:35 +08:00 |
|
牛叉闪闪
|
9b8ec56b96
|
添加耗材信息单价字段
|
2024-08-17 18:25:03 +08:00 |
|
|
|
d10a9671a9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-17 17:37:23 +08:00 |
|
|
|
7da10ca43e
|
1.代客下单挂单修改
|
2024-08-17 17:37:06 +08:00 |
|
牛叉闪闪
|
a21e361b4e
|
Merge remote-tracking branch 'origin/hph' into test
|
2024-08-17 17:04:08 +08:00 |
|
|
|
e8f9af93e8
|
1.商品不推送修复
|
2024-08-17 16:57:51 +08:00 |
|
|
|
fcaba6d511
|
1.商品不推送修复
|
2024-08-17 16:52:29 +08:00 |
|
|
|
b13a48d5e5
|
1.商品不推送修复
|
2024-08-17 16:49:18 +08:00 |
|
牛叉闪闪
|
3807eb43ce
|
添加耗材信息单价字段
|
2024-08-17 15:28:21 +08:00 |
|
|
|
7eab45ae49
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-17 15:22:38 +08:00 |
|
