You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

YunaiV 41e5cf5285 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp ... # Conflicts: # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBargainOrderHandler.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationOrderHandler.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeSeckillOrderHandler.java		3 years ago
..
yudao-module-product-api	code review：积分、优惠劵、佣金等逻辑	3 years ago
yudao-module-product-biz	code review：积分、优惠劵、佣金等逻辑	3 years ago
yudao-module-promotion-api	秒杀活动：完成订单取消时恢复活动库存和商品库存	3 years ago
yudao-module-promotion-biz	拼团记录（admin-api）：增加 page-by-headId 接口获取指定 headId 完整拼团列表分页	3 years ago
yudao-module-statistics-api	商城：增加 stat 统计设计	3 years ago
yudao-module-statistics-biz	stat：增加用户统计的设计	3 years ago
yudao-module-trade-api	拼团活动：完善 review 提到的问题	3 years ago
yudao-module-trade-biz	Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product_tmp	3 years ago
pom.xml	商城：增加 stat 统计设计	3 years ago