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 a11dd1be28 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp ... # Conflicts: # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java		4 years ago
..
yudao-module-coupon-api	mall:上传enum类，做后端模板添加判定、前端页面添加	4 years ago
yudao-module-coupon-biz	mall:上传enum类，做后端模板添加判定、前端页面添加	4 years ago
yudao-module-market-api	mall：新增 discount 限时折扣、reward 满减送	4 years ago
yudao-module-market-biz	mall：新增 discount 限时折扣、reward 满减送	4 years ago
yudao-module-product-api	mall：优化订单表的设计	4 years ago
yudao-module-product-biz	Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp	4 years ago
yudao-module-trade-api	mall：调整 trade 的接口	4 years ago
yudao-module-trade-biz	mall：新增价格计算的接口	4 years ago
pom.xml	mall:上传自动化生成的模板文件	4 years ago