 SongZhang
|
5a0112132d
|
Merge remote-tracking branch 'origin/dev' into zs
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
|
2024-08-14 14:11:53 +08:00 |
牛叉闪闪
|
4a0a548565
|
加入购物车添加耗材控制
|
2024-08-14 11:35:39 +08:00 |
|
牛叉闪闪
|
6c6a447a5e
|
加入购物车添加耗材控制
|
2024-08-14 11:16:28 +08:00 |
|
SongZhang
|
146cb0f00b
|
Merge remote-tracking branch 'origin/dev' into zs
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java
|
2024-08-14 09:44:53 +08:00 |
|
牛叉闪闪
|
dc6df17a3f
|
修改商品规格加入购物车
|
2024-08-14 09:43:56 +08:00 |
|
牛叉闪闪
|
780707e55c
|
修改商品规格加入购物车
|
2024-08-14 09:40:41 +08:00 |
|
牛叉闪闪
|
b5bc0f2e0a
|
修改商品规格加入购物车
|
2024-08-14 09:38:44 +08:00 |
|
SongZhang
|
e640226629
|
1.推送
|
2024-08-13 14:36:16 +08:00 |
|
SongZhang
|
148440cb31
|
1.无法修改库存fix
|
2024-08-13 14:33:12 +08:00 |
|
牛叉闪闪
|
d93bfd24a1
|
添加获取最大折扣接口
|
2024-08-13 14:30:22 +08:00 |
|
SongZhang
|
f7b845201c
|
1.无法修改库存fix
|
2024-08-13 09:06:07 +08:00 |
|
SongZhang
|
a8b9223454
|
Merge remote-tracking branch 'origin/zs2' into dev
|
2024-08-12 15:13:43 +08:00 |
|
SongZhang
|
22eadf7193
|
1.推送增加店铺开关校验
|
2024-08-12 14:35:27 +08:00 |
|
SongZhang
|
923ee6f1cb
|
1.上下架售罄接口
|
2024-08-12 14:25:14 +08:00 |
|
牛叉闪闪
|
6de1857e3c
|
Merge remote-tracking branch 'origin/master'
|
2024-08-09 16:17:54 +08:00 |
|
牛叉闪闪
|
a2028b6dd8
|
修改打印逻辑
|
2024-08-09 16:17:41 +08:00 |
|
SongZhang
|
556d6cabf3
|
1.代客下单相关接口
|
2024-08-09 16:16:27 +08:00 |
|
SongZhang
|
86df7addd6
|
1.代客下单相关接口
|
2024-08-09 16:07:00 +08:00 |
|
SongZhang
|
c300f61def
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-09 15:58:00 +08:00 |
|
SongZhang
|
63f5c54284
|
1.耗材推送数量不准确问题
|
2024-08-09 15:57:52 +08:00 |
|
牛叉闪闪
|
5b14a4f342
|
修改打印逻辑
|
2024-08-09 14:48:58 +08:00 |
 wangw
|
6732e8905d
|
订单状态错误问题
|
2024-08-07 15:01:55 +08:00 |
|
牛叉闪闪
|
736389aa65
|
修改交班数据
|
2024-08-05 16:17:18 +08:00 |
|
牛叉闪闪
|
5ed9c3abef
|
修改交班数据
|
2024-08-05 14:44:05 +08:00 |
|
SongZhang
|
8d600dfbe8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-03 18:01:16 +08:00 |
|
SongZhang
|
cbc56efa37
|
1.耗材推送数量不准确问题
|
2024-08-03 18:01:06 +08:00 |
|
wangw
|
11a1837361
|
git提交不识别log
|
2024-08-03 16:46:33 +08:00 |
|
SongZhang
|
8f03b7077b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-03 10:15:04 +08:00 |
|
SongZhang
|
b658557d83
|
1.关闭库存不推送库存预警
|
2024-08-03 10:14:37 +08:00 |
|
牛叉闪闪
|
b70a88203d
|
修改退单sku
|
2024-08-02 15:57:43 +08:00 |
|
牛叉闪闪
|
6359f9b466
|
修改退单sku
|
2024-08-02 15:48:56 +08:00 |
|
牛叉闪闪
|
7da9604c55
|
修改交班信息存储
|
2024-08-02 15:03:05 +08:00 |
|
牛叉闪闪
|
c1530e0506
|
修改交班信息存储
|
2024-08-02 15:01:54 +08:00 |
|
牛叉闪闪
|
a4ea3fe8bb
|
Merge remote-tracking branch 'origin/hph' into dev
|
2024-08-02 11:10:55 +08:00 |
|
牛叉闪闪
|
e7692107a6
|
修改交班报错
|
2024-08-02 11:10:29 +08:00 |
|
wangw
|
cc5fea21e8
|
员工登录 重复账号问题
|
2024-08-02 09:26:52 +08:00 |
|
SongZhang
|
6c528e3ac6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-01 11:22:21 +08:00 |
|
SongZhang
|
38d8c4c817
|
1.耗材推送时间
|
2024-08-01 11:22:06 +08:00 |
|
wangw
|
e617e08923
|
订单备注
|
2024-08-01 11:15:50 +08:00 |
|
wangw
|
f3f0e39459
|
订单备注
|
2024-08-01 10:52:55 +08:00 |
|
SongZhang
|
8a31f093fe
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-31 14:27:40 +08:00 |
|
SongZhang
|
2c40d6ec6b
|
1.耗材预警错误判断修复
|
2024-07-31 14:27:29 +08:00 |
|
牛叉闪闪
|
8a51ed732e
|
修改交班
|
2024-07-31 14:13:30 +08:00 |
|
牛叉闪闪
|
8a0589e384
|
Merge remote-tracking branch 'origin/dev' into hph
|
2024-07-31 14:01:00 +08:00 |
|
牛叉闪闪
|
b93cb6c779
|
修改交班
|
2024-07-31 14:00:28 +08:00 |
|
SongZhang
|
8f213254e3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-31 13:59:16 +08:00 |
|
牛叉闪闪
|
ed516fbcf7
|
修改退款反还耗材功能
|
2024-07-30 18:36:59 +08:00 |
|
牛叉闪闪
|
00ea7079d7
|
Merge remote-tracking branch 'origin/hph' into dev
|
2024-07-30 09:37:10 +08:00 |
|
牛叉闪闪
|
bd50d13b9a
|
修改交班数据中的交班时间
|
2024-07-30 09:36:35 +08:00 |
|
牛叉闪闪
|
cf316508de
|
添加订单备注
|
2024-07-29 16:00:50 +08:00 |