牛叉闪闪
|
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 |
|
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 |
|
牛叉闪闪
|
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 |
|
GYJ
|
b218436a1c
|
优化台桌统计
|
2024-08-08 10:41:12 +08:00 |
|
wangw
|
3d43f5f114
|
日志 详情
|
2024-08-08 10:00:59 +08:00 |
|
wangw
|
9e13d1ff98
|
商品规格修改
|
2024-08-08 09:12:35 +08:00 |
|
牛叉闪闪
|
568375b115
|
修改盘点库存数字校验
|
2024-08-05 15:27:47 +08:00 |
|
牛叉闪闪
|
13961cc6fc
|
修改查询交班数据
|
2024-08-05 14:31:09 +08:00 |
|
牛叉闪闪
|
b8e1907d49
|
修改供应商为非必填
|
2024-08-05 11:32:15 +08:00 |
|
牛叉闪闪
|
115c722e3b
|
修改供应商为非必填
|
2024-08-05 11:21:23 +08:00 |
|
牛叉闪闪
|
e89b9e4eef
|
Merge remote-tracking branch 'origin/dev'
|
2024-08-05 10:20:33 +08:00 |
|
牛叉闪闪
|
9de0c594cd
|
修改供应商为非必填
|
2024-08-05 10:18:34 +08:00 |
|
牛叉闪闪
|
e9b0301eb9
|
修改供应商为非必填
|
2024-08-03 18:28:25 +08:00 |
|
牛叉闪闪
|
11e2663fb3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-08-03 18:22:58 +08:00 |
|
牛叉闪闪
|
443df8faa3
|
修改供应商为非必填
|
2024-08-03 18:22:36 +08:00 |
|
wangw
|
60cdf33b7b
|
用户 修改密码
|
2024-08-03 17:35:28 +08:00 |
|
wangw
|
cd8ccb9a8e
|
git提交识别
|
2024-08-03 15:41:46 +08:00 |
|
wangw
|
f18769abd5
|
登录回传
|
2024-08-03 15:39:49 +08:00 |
|
牛叉闪闪
|
db15b53826
|
修改供应商为非必填
|
2024-08-03 15:32:44 +08:00 |
|
wangw
|
a1ebe64c20
|
登录回传 用户标识
|
2024-08-03 15:29:41 +08:00 |
|
wangw
|
cf2ac9755f
|
商品出入库 和 耗材出入库 日志记录 明确描述
|
2024-08-03 14:44:33 +08:00 |
|
wangw
|
b70c00667a
|
商品出入库 和 耗材出入库 日志记录 明确描述
|
2024-08-03 14:44:09 +08:00 |
|
SongZhang
|
96b9d50088
|
多规格商品，不共享库存，一个规格为上架状态，其他规格为下架状态，开启共享库存，共享库存为下架状态
|
2024-08-03 09:54:29 +08:00 |
|
SongZhang
|
f0755c58a1
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-03 09:50:44 +08:00 |
|
wangw
|
48488daad8
|
员工删除
个人中心 修改密码
商品设置热门
|
2024-08-02 16:43:46 +08:00 |
|
SongZhang
|
49ec7ab65d
|
1.数据报表销量导出修改
2.开启关闭库存分组微信提醒
3.盘点出入库展示规格名称
|
2024-08-02 16:11:23 +08:00 |
|
SongZhang
|
6cc0da2ed0
|
Merge remote-tracking branch 'origin/dev' into zs
|
2024-08-02 09:12:28 +08:00 |
|
wangw
|
b0e60ba54e
|
实体类问题
|
2024-08-01 18:27:24 +08:00 |
|
wangw
|
8a07cde563
|
Merge branch 'dev'
|
2024-08-01 18:24:27 +08:00 |
|
wangw
|
16c6ff1ccf
|
日志标识
|
2024-08-01 18:21:06 +08:00 |