Commit Graph

7 Commits

Author SHA1 Message Date
6c30aa2abd 订单15分钟到期 状态监听 库存回滚
商品排序值 初始化
出入库 日志记录
酒品管理
购物车次日清空
2024-06-17 17:55:56 +08:00
b31148da52 菜单 子集
存酒
购买须知
团购商品
用户列表
2024-05-29 15:24:50 +08:00
44509e1d32 应用中心
-存酒
团购卷退款
2024-05-21 16:18:10 +08:00
wangguocheng
0e35116e9d 添加活动 2024-05-20 15:05:52 +08:00
wangguocheng
e32436e744 添加活动 2024-05-17 11:52:49 +08:00
5ac93618a6 日志记录 2024-04-29 09:59:48 +08:00
ecae487993 Merge remote-tracking branch 'origin/master' into feature
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
2024-04-29 09:46:09 +08:00