韩鹏辉
|
4d526525a5
|
添加耗材警告
|
2024-07-05 14:22:21 +08:00 |
|
韩鹏辉
|
d772c63ee5
|
添加耗材警告
|
2024-07-05 10:20:09 +08:00 |
|
韩鹏辉
|
781a4baa81
|
添加耗材警告
|
2024-07-03 14:52:25 +08:00 |
|
韩鹏辉
|
f7b44edf0d
|
添加耗材警告
|
2024-07-03 14:51:55 +08:00 |
 SongZhang
|
8da3d036b1
|
下单扣取库存
|
2024-07-03 10:57:40 +08:00 |
|
SongZhang
|
e31f3c831a
|
库存预警支持多账号订阅
|
2024-07-02 16:13:24 +08:00 |
GYJ
|
d35a5f2cc0
|
退单增加库存记录
|
2024-07-02 11:15:55 +08:00 |
|
GYJ
|
5a8af7f0bb
|
添加isDistribute注释
|
2024-07-02 10:13:34 +08:00 |
|
GYJ
|
286b9af051
|
mapper参数写错
|
2024-06-29 09:30:28 +08:00 |
|
韩鹏辉
|
8f4afed929
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-06-28 18:00:00 +08:00 |
|
韩鹏辉
|
4e27eb87b5
|
修改耗材库存
|
2024-06-28 17:59:41 +08:00 |
|
GYJ
|
5a61e994a1
|
下单根据是否共享库存判断商品和sku库存
|
2024-06-28 14:57:46 +08:00 |
|
SongZhang
|
d82387e9d1
|
新增下单库存预警消息推送
|
2024-06-28 14:15:42 +08:00 |
|
韩鹏辉
|
fad761b63c
|
修改耗材库存
|
2024-06-28 09:39:29 +08:00 |
|
韩鹏辉
|
75ec8fc9e5
|
修改耗材库存
|
2024-06-28 09:39:14 +08:00 |
 wangw
|
e91636a188
|
分页配置统一
|
2024-06-27 14:21:46 +08:00 |
|
韩鹏辉
|
d8305159bd
|
根据token 获取店铺信息
|
2024-06-26 16:49:41 +08:00 |
|
wangw
|
b96c4dcef2
|
冲突
|
2024-06-26 14:32:49 +08:00 |
|
wangw
|
aa51ff123b
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/mapper/TbOrderInfoMapper.xml
|
2024-06-26 14:30:08 +08:00 |
|
wangw
|
7b90da01d6
|
Merge branch 'master' into dev
|
2024-06-26 14:29:01 +08:00 |
|
韩鹏辉
|
abc5ea04e4
|
Merge branch '1.0.1' into dev
|
2024-06-26 14:28:36 +08:00 |
|
韩鹏辉
|
18925ac98f
|
修改打印
|
2024-06-26 14:28:04 +08:00 |
|
韩鹏辉
|
22c0032f78
|
Merge remote-tracking branch 'origin/master'
|
2024-06-26 11:12:40 +08:00 |
|
韩鹏辉
|
3668252207
|
修改打印
|
2024-06-26 11:12:28 +08:00 |
|
wangw
|
92fb9c48a0
|
解决页数超限 仍返回数据问题
|
2024-06-26 11:09:05 +08:00 |
|
韩鹏辉
|
7f986324e0
|
修改打印
|
2024-06-26 09:24:46 +08:00 |
|
GYJ
|
bd0054ffa8
|
Merge branch 'refs/heads/stock-share' into dev
|
2024-06-26 09:18:57 +08:00 |
|
GYJ
|
2310a0164b
|
回滚库存
|
2024-06-25 15:31:50 +08:00 |
|
韩鹏辉
|
82935827f5
|
修改打印
|
2024-06-25 15:08:46 +08:00 |
|
韩鹏辉
|
4f6cd81505
|
修改打印
|
2024-06-25 14:54:07 +08:00 |
|
韩鹏辉
|
8fc41c1b07
|
修改库存
|
2024-06-25 09:58:47 +08:00 |
|
韩鹏辉
|
86bdcbe3c5
|
修改库存
|
2024-06-25 09:58:21 +08:00 |
|
GYJ
|
b66a89b143
|
退款回滚库存
|
2024-06-24 18:00:25 +08:00 |
|
GYJ
|
fa2668ed1c
|
添加字段
|
2024-06-24 15:05:26 +08:00 |
|
GYJ
|
c1790a3198
|
memberIn 增加shopId merchantId
|
2024-06-20 15:19:03 +08:00 |
|
wangw
|
f4d177609c
|
新增接口 分类列表(包括子分类)
|
2024-06-20 13:34:42 +08:00 |
|
wangw
|
762a902950
|
新增接口 分类列表(包括子分类)
|
2024-06-20 11:57:02 +08:00 |
|
韩鹏辉
|
08625bd03e
|
修改库存
|
2024-06-19 18:07:13 +08:00 |
|
GYJ
|
a6adc81366
|
退款回滚库存
|
2024-06-19 17:36:45 +08:00 |
|
韩鹏辉
|
d46d4ca6df
|
修改库存
|
2024-06-19 17:27:38 +08:00 |
|
韩鹏辉
|
5b97722699
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/chaozhanggui/system/cashierservice/annotation/LimitSubmit.java
# src/main/java/com/chaozhanggui/system/cashierservice/interceptor/LimitSubmitAspect.java
# src/main/java/com/chaozhanggui/system/cashierservice/interceptor/WebAppConfigurer.java
# src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
# src/main/java/com/chaozhanggui/system/cashierservice/util/RedisConfig.java
# src/main/java/com/chaozhanggui/system/cashierservice/util/RedisUtils.java
# src/main/resources/generator-mapper/generatorConfig.xml
|
2024-06-19 16:46:27 +08:00 |
|
韩鹏辉
|
50fa846cf1
|
修改库存
|
2024-06-19 16:44:11 +08:00 |
|
韩鹏辉
|
90a8fd4a54
|
添加类型
|
2024-06-14 15:28:13 +08:00 |
|
韩鹏辉
|
e5f5317f4e
|
修改库存
|
2024-06-12 11:57:55 +08:00 |
|
韩鹏辉
|
e109b31ff2
|
修改库存
|
2024-06-12 10:14:05 +08:00 |
|
韩鹏辉
|
c50172f5ca
|
修改库存
|
2024-06-12 10:12:58 +08:00 |
|
韩鹏辉
|
a1764e77c6
|
修改库存
|
2024-06-12 10:03:09 +08:00 |
|
韩鹏辉
|
7e8a86db6f
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/cashier-client
|
2024-06-04 16:03:50 +08:00 |
|
韩鹏辉
|
ee3efaff6a
|
修改会员添加报错
|
2024-06-04 16:03:39 +08:00 |
|
wangw
|
21008fd918
|
会员新建关联
会员支付金额校验
团购卷退款订单号
|
2024-06-04 09:15:42 +08:00 |