 SongZhang
|
b13a48d5e5
|
1.商品不推送修复
|
2024-08-17 16:49:18 +08:00 |
牛叉闪闪
|
3807eb43ce
|
添加耗材信息单价字段
|
2024-08-17 15:28:21 +08:00 |
|
SongZhang
|
7eab45ae49
|
Merge remote-tracking branch 'origin/test' into test
|
2024-08-17 15:22:38 +08:00 |
|
SongZhang
|
89582d3bc8
|
1.代客下单 挂起订单
|
2024-08-17 15:21:45 +08:00 |
 wangw
|
1de1edb537
|
分组时间管控
|
2024-08-17 14:38:00 +08:00 |
|
wangw
|
df95c09724
|
用户管理 排序
|
2024-08-17 14:15:12 +08:00 |
|
wangw
|
a53e9f7ab4
|
活动管理 赠送商品
|
2024-08-17 11:49:01 +08:00 |
GYJ
|
8e0f237e2e
|
台桌数据导出修改
|
2024-08-17 11:29:59 +08:00 |
|
SongZhang
|
e938911e4a
|
1.代客下单 挂起订单
|
2024-08-17 10:03:11 +08:00 |
|
牛叉闪闪
|
0c5192e86e
|
添加耗材信息更新时间和创建时间字段
|
2024-08-16 18:13:51 +08:00 |
|
wangw
|
5732e6974f
|
商品分组-时段 跨日的展示 次日
|
2024-08-16 18:00:25 +08:00 |
|
wangw
|
1cfc94b22a
|
Merge branch 'test' into dev
|
2024-08-16 15:41:32 +08:00 |
|
wangw
|
adee84544d
|
数据报表-销量-统计
|
2024-08-16 14:52:59 +08:00 |
|
SongZhang
|
7c122565fc
|
1.增加库存记录mq处理
|
2024-08-16 14:45:50 +08:00 |
|
SongZhang
|
2ec29a3825
|
Merge remote-tracking branch 'origin/dev' into zs2
|
2024-08-16 13:47:41 +08:00 |
|
SongZhang
|
b8a60a1549
|
1.增加库存记录mq处理
|
2024-08-16 13:38:52 +08:00 |
|
SongZhang
|
d32f9705a0
|
1.代客下单，支付，挂起，下单接口开发
|
2024-08-16 11:12:25 +08:00 |
|
SongZhang
|
62ca02cdc4
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-16 11:11:21 +08:00 |
|
SongZhang
|
4a8bce3c34
|
1.增加库存预警模板消息id
|
2024-08-16 11:10:54 +08:00 |
|
wangw
|
199e787d92
|
Merge branch 'test' into dev
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
|
2024-08-16 09:23:43 +08:00 |
|
wangw
|
7271e77b05
|
数据报表-销量-统计
商品 规格 返回
|
2024-08-15 18:23:46 +08:00 |
|
GYJ
|
a183d2bfec
|
修改销量和台桌导出 -- 合并
|
2024-08-15 17:33:03 +08:00 |
|
GYJ
|
fa566a7057
|
Merge branch 'refs/heads/gyj' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
|
2024-08-15 17:31:07 +08:00 |
|
GYJ
|
3d9e4ee511
|
修改销量和台桌导出
|
2024-08-15 17:25:36 +08:00 |
|
GYJ
|
f808912006
|
Merge branch 'refs/heads/test' into gyj
|
2024-08-15 13:50:16 +08:00 |
|
牛叉闪闪
|
5fe0e2a83b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-14 15:08:48 +08:00 |
|
牛叉闪闪
|
9d8bb72a7e
|
添加耗材库存检测开关
|
2024-08-14 15:08:28 +08:00 |
|
SongZhang
|
a0930151a8
|
1.推送修改
|
2024-08-14 15:05:16 +08:00 |
|
SongZhang
|
441ecf38f1
|
1.代客下单相关接口
|
2024-08-14 15:04:53 +08:00 |
|
SongZhang
|
9bfa67d71b
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-14 11:31:31 +08:00 |
|
牛叉闪闪
|
9ec06de8cd
|
添加耗材库存检测开关
|
2024-08-14 11:29:15 +08:00 |
|
wangw
|
cd6d6f2e07
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductGroupServiceImpl.java
|
2024-08-14 11:17:16 +08:00 |
|
SongZhang
|
27f7d07f27
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-14 11:01:18 +08:00 |
|
牛叉闪闪
|
b08ff62d86
|
修改耗材信息
|
2024-08-14 10:59:27 +08:00 |
|
SongZhang
|
7715b758f1
|
Merge remote-tracking branch 'origin/dev' into zs
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
|
2024-08-14 10:28:04 +08:00 |
|
牛叉闪闪
|
6e03ad4997
|
添加订单数量和充值金额字段
|
2024-08-14 10:19:47 +08:00 |
|
wangw
|
c35df24d2d
|
分组增加可售时段
|
2024-08-14 09:43:25 +08:00 |
|
牛叉闪闪
|
eb32bedc25
|
修改会员充值奖励功能
|
2024-08-13 14:50:27 +08:00 |
|
SongZhang
|
a7de11423f
|
1.数据报表导出cpu拉高问题修复
2.代客下单相关接口
|
2024-08-13 14:39:32 +08:00 |
|
SongZhang
|
e53037232f
|
1.数据报表导出cpu拉高问题修复
|
2024-08-13 10:59:27 +08:00 |
|
SongZhang
|
fd5b79d6ec
|
1.代客下单规格修改接口
|
2024-08-13 09:48:03 +08:00 |
|
SongZhang
|
7f1c028fed
|
1.代课下单支持赠送
|
2024-08-13 09:02:44 +08:00 |
|
SongZhang
|
66ae922dc4
|
Merge remote-tracking branch 'origin/zs' into test
|
2024-08-12 15:33:21 +08:00 |
|
SongZhang
|
0e9996bcf0
|
1.通知中心相关接口
2.代客下单
|
2024-08-12 14:55:21 +08:00 |
|
wangw
|
d862eb43be
|
获取商家 会员二维码
|
2024-08-12 14:18:31 +08:00 |
|
wangw
|
5cf796ac83
|
sql skuId问题
|
2024-08-12 13:57:41 +08:00 |
|
SongZhang
|
220c717085
|
1.下架无法查询到导致报错问题修复
|
2024-08-09 10:23:57 +08:00 |
|
wangw
|
8e1aa5bc19
|
修改商品 规格
|
2024-08-08 14:25:42 +08:00 |
|
GYJ
|
bff2ad2250
|
优化台桌统计
|
2024-08-08 10:42:13 +08:00 |
|
GYJ
|
260d6eb7d7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-08 10:41:35 +08:00 |