牛叉闪闪
|
7e4299eecc
|
添加耗材记录通过店铺id
|
2024-07-20 16:02:45 +08:00 |
|
牛叉闪闪
|
4bd089e0fc
|
添加耗材记录通过店铺id
|
2024-07-20 15:17:05 +08:00 |
|
牛叉闪闪
|
946a827154
|
添加耗材单位
|
2024-07-18 17:43:17 +08:00 |
 SongZhang
|
66c3f2ab62
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-18 14:27:15 +08:00 |
|
SongZhang
|
5943f1b72f
|
1.sku售出记录不保存问题
2.库存条目数不一致
|
2024-07-18 14:26:58 +08:00 |
GYJ
|
cf1f5c8688
|
Merge branch 'refs/heads/gyj' into dev
|
2024-07-17 11:25:58 +08:00 |
|
GYJ
|
34c190ced8
|
订单查询携带商品名称模糊查询
|
2024-07-17 11:25:16 +08:00 |
|
牛叉闪闪
|
762c23b08e
|
添加耗材单位
|
2024-07-17 11:12:07 +08:00 |
|
SongZhang
|
a16b2925b2
|
1.库存新增上下架接口
2.库存记录返回orderNo
3.增加保存库存记录mq处理
|
2024-07-17 09:55:23 +08:00 |
|
SongZhang
|
279057d54f
|
Merge remote-tracking branch 'origin/dev'
|
2024-07-17 09:52:28 +08:00 |
|
韩鹏辉
|
5b31342d32
|
添加耗材单位
|
2024-07-12 13:42:48 +08:00 |
|
韩鹏辉
|
f8269e35a3
|
添加耗材单位
|
2024-07-12 11:18:19 +08:00 |
|
SongZhang
|
86c39780ee
|
耗材分类查询接口增加已绑定数量字段
|
2024-07-12 10:45:16 +08:00 |
|
韩鹏辉
|
5226b1719a
|
修改耗材代码生成规则
|
2024-07-12 09:01:33 +08:00 |
|
GYJ
|
b6df6fd74d
|
商品库存导出未带入分类参数
|
2024-07-11 18:48:38 +08:00 |
|
韩鹏辉
|
46f85fe5fb
|
修改耗材信息校验
|
2024-07-11 17:36:59 +08:00 |
|
韩鹏辉
|
c7557c9b12
|
修改耗材信息校验
|
2024-07-11 17:34:24 +08:00 |
|
韩鹏辉
|
d232e923d6
|
修改耗材信息校验
|
2024-07-11 17:24:55 +08:00 |
|
GYJ
|
9590359f13
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-11 16:59:15 +08:00 |
 wangw
|
ed2440d2d5
|
商品 规格 编辑
|
2024-07-11 16:58:10 +08:00 |
|
韩鹏辉
|
2ed9bb48ec
|
修改耗材信息校验
|
2024-07-11 15:43:13 +08:00 |
|
SongZhang
|
134cb90a02
|
Merge remote-tracking branch 'origin/master'
|
2024-07-11 13:51:30 +08:00 |
|
SongZhang
|
bebe538e79
|
库存预警数值不展示修复
|
2024-07-11 13:51:20 +08:00 |
|
SongZhang
|
98e49a8e30
|
Merge remote-tracking branch 'origin/dev'
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java
|
2024-07-11 13:37:04 +08:00 |
|
韩鹏辉
|
11b3af6104
|
添加发送短信,设置操作密码
|
2024-07-11 13:34:28 +08:00 |
|
韩鹏辉
|
21fb470052
|
添加发送短信
|
2024-07-11 11:35:35 +08:00 |
|
韩鹏辉
|
6a8ea3416f
|
Merge remote-tracking branch 'origin/dev'
|
2024-07-10 18:16:17 +08:00 |
|
wangw
|
da97da3d7d
|
会员列表
|
2024-07-10 18:07:18 +08:00 |
|
GYJ
|
35312b6137
|
Merge branch 'refs/heads/dev'
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
# eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java
|
2024-07-10 17:46:14 +08:00 |
|
wangw
|
713350ac3a
|
会员标识
|
2024-07-10 17:42:59 +08:00 |
|
韩鹏辉
|
7214d9d4fc
|
添加前端传递数据校验
|
2024-07-10 17:40:52 +08:00 |
|
韩鹏辉
|
90501ccfb1
|
添加前端传递数据校验
|
2024-07-10 17:40:22 +08:00 |
|
韩鹏辉
|
17cfaa2a61
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-07-10 17:26:06 +08:00 |
|
韩鹏辉
|
570f5611df
|
修改耗材商品批量添加
|
2024-07-10 17:25:50 +08:00 |
|
wangw
|
ad628b3d72
|
sku 逻辑删除
|
2024-07-10 17:11:02 +08:00 |
|
韩鹏辉
|
c49765c353
|
修改耗材商品批量添加
|
2024-07-10 16:18:34 +08:00 |
|
GYJ
|
8ad0274048
|
Merge branch 'refs/heads/gyj' into dev
|
2024-07-10 15:20:11 +08:00 |
|
GYJ
|
9f2f9bf59a
|
充值查询增加 scanMemberAwardIn 系统奖励
|
2024-07-10 15:19:52 +08:00 |
|
wangw
|
981671d583
|
歌曲页面 增加 歌手页地址
|
2024-07-10 14:09:26 +08:00 |
|
wangw
|
d528c4c10d
|
歌曲页面 增加 歌手页地址
|
2024-07-10 14:00:12 +08:00 |
|
GYJ
|
2efdb7d780
|
Merge branch 'refs/heads/gyj' into dev
|
2024-07-10 13:41:34 +08:00 |
|
GYJ
|
df6a41430e
|
修改查询会员充值bug
|
2024-07-10 13:37:39 +08:00 |
|
韩鹏辉
|
f23fa44c57
|
修改耗材商品批量添加
|
2024-07-10 11:08:10 +08:00 |
|
GYJ
|
b3194b83dc
|
修复查询会员充值金额bug
|
2024-07-10 10:12:21 +08:00 |
|
GYJ
|
27c8cb1959
|
Merge branch 'refs/heads/dev'
|
2024-07-10 09:27:25 +08:00 |
|
GYJ
|
d5a5332e78
|
Merge branch 'refs/heads/dev'
|
2024-07-10 09:08:43 +08:00 |
|
wangw
|
01d7327be6
|
Merge branch 'gyj' into dev
|
2024-07-09 16:13:12 +08:00 |
|
GYJ
|
a09a46e0ea
|
查询导出充值记录
|
2024-07-09 16:04:25 +08:00 |
|
韩鹏辉
|
a5cea4293f
|
添加订单台桌字段
|
2024-07-09 16:02:38 +08:00 |
|
SongZhang
|
370fe409f6
|
Merge remote-tracking branch 'origin/dev'
|
2024-07-09 15:55:30 +08:00 |