 wangw
|
0dcc46d00d
|
Merge branch 'ww' into test
|
2024-10-17 10:42:45 +08:00 |
|
wangw
|
312c9cc1be
|
耗材列表 关联 商品
|
2024-10-17 10:42:12 +08:00 |
|
wangw
|
973796f491
|
Merge branch 'ww' into test
|
2024-10-17 10:17:32 +08:00 |
|
wangw
|
0f7502df06
|
耗材列表
|
2024-10-17 10:17:06 +08:00 |
|
wangw
|
dc9859b31d
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
|
2024-10-17 09:57:59 +08:00 |
|
wangw
|
30f21e1dd3
|
排序
|
2024-10-17 09:56:38 +08:00 |
 SongZhang
|
e2a127c0d0
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-17 09:13:18 +08:00 |
|
SongZhang
|
519bedfc7c
|
detail价格计算折扣
|
2024-10-17 09:12:58 +08:00 |
|
wangw
|
d79f737665
|
耗材列表
|
2024-10-16 17:56:04 +08:00 |
|
wangw
|
e04281d8b9
|
耗材列表
|
2024-10-16 17:54:16 +08:00 |
|
SongZhang
|
eff2d6d630
|
购物车修改接口 fix
|
2024-10-16 15:22:32 +08:00 |
|
SongZhang
|
54acf2a0f5
|
打包赠送允许不传递值
|
2024-10-16 15:11:53 +08:00 |
|
SongZhang
|
483af5462d
|
购物车获取修改
|
2024-10-16 14:27:27 +08:00 |
|
SongZhang
|
0417d122fb
|
退单接口修改
|
2024-10-16 14:14:43 +08:00 |
|
SongZhang
|
74a4514c3c
|
退单接口修改 购物车查询逻辑修改
|
2024-10-16 14:13:11 +08:00 |
|
wangw
|
8931ce98fa
|
Merge branch 'ww' into test
|
2024-10-15 18:05:24 +08:00 |
|
wangw
|
cd4008d824
|
报损 备注问题
|
2024-10-15 17:59:58 +08:00 |
|
wangw
|
03e0793e59
|
Merge branch 'ww' into test
|
2024-10-15 17:43:59 +08:00 |
|
wangw
|
ffc2568b98
|
报损数量问题
|
2024-10-15 17:43:40 +08:00 |
|
wangw
|
7de19ffb1f
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java
|
2024-10-15 15:51:45 +08:00 |
|
wangw
|
c105c8d0ff
|
实体类
|
2024-10-15 15:51:05 +08:00 |
|
wangw
|
9e8d74845a
|
Merge branch 'ww' into test
|
2024-10-15 14:33:11 +08:00 |
|
wangw
|
a6a8c330ae
|
耗材 判断记录
|
2024-10-15 14:32:30 +08:00 |
|
SongZhang
|
ef7f4ebb8e
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-15 14:07:12 +08:00 |
|
SongZhang
|
1a8a15193e
|
修改接口支持打包赠送
|
2024-10-15 14:07:01 +08:00 |
|
wangw
|
1ed5338032
|
Merge branch 'ww' into test
|
2024-10-15 13:25:09 +08:00 |
|
wangw
|
01405b33e9
|
删除商品
|
2024-10-15 13:24:40 +08:00 |
|
wangw
|
544a251a67
|
Merge branch 'ww' into test
|
2024-10-15 10:06:33 +08:00 |
|
wangw
|
f8c763ad9d
|
商品修改库存 记录
|
2024-10-15 10:06:02 +08:00 |
|
wangw
|
fdf551358f
|
添加商品 规格丢失问题
|
2024-10-14 16:36:42 +08:00 |
|
wangw
|
192605ae90
|
添加商品 规格丢失问题
|
2024-10-14 16:35:09 +08:00 |
|
SongZhang
|
5e8e6661b9
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-14 16:28:53 +08:00 |
|
SongZhang
|
4c19b6c9d3
|
取餐码获取为null修复
|
2024-10-14 16:28:37 +08:00 |
|
SongZhang
|
347431f199
|
取餐码获取为null修复
|
2024-10-14 16:28:08 +08:00 |
|
wangw
|
da9a1dc3b8
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
|
2024-10-14 15:30:07 +08:00 |
|
wangw
|
68fac45b7a
|
销售统计
|
2024-10-14 15:29:23 +08:00 |
|
wangw
|
f87a2747bc
|
Merge branch 'ww' into test
|
2024-10-14 15:22:18 +08:00 |
|
wangw
|
2d03914963
|
分类 列表 数据问题
销售统计
|
2024-10-14 15:20:35 +08:00 |
|
wangw
|
bf5e5ec7dd
|
Merge branch 'ww' into test
|
2024-10-14 14:56:57 +08:00 |
|
wangw
|
5468fa56de
|
分类 列表 数据问题
|
2024-10-14 14:55:09 +08:00 |
|
SongZhang
|
1cc7188488
|
赠送商品单独拎出
|
2024-10-14 13:40:25 +08:00 |
|
SongZhang
|
a9d92e98c5
|
退菜fix
|
2024-10-14 13:26:56 +08:00 |
|
SongZhang
|
f01c6c0e3c
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-14 10:30:00 +08:00 |
|
SongZhang
|
5a2c3f4208
|
客座费获取修改
|
2024-10-14 10:29:51 +08:00 |
谭凯凯
|
e659d1f420
|
调整打印机配置参数
|
2024-10-14 10:24:11 +08:00 |
|
SongZhang
|
afbfde52bb
|
打印延迟3s 防止事务未提交
|
2024-10-14 10:15:41 +08:00 |
|
SongZhang
|
72dca1d7c4
|
Merge remote-tracking branch 'origin/test' into test
|
2024-10-14 10:03:24 +08:00 |
|
SongZhang
|
c88b838e88
|
退款修改
|
2024-10-14 10:03:03 +08:00 |
|
wangw
|
958f1cfc5e
|
Merge branch 'ww' into test
|
2024-10-14 09:14:15 +08:00 |
|
wangw
|
cab483a7b9
|
耗材记录
|
2024-10-14 09:13:51 +08:00 |