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.
besure_server/yudao-module-mall
puhui999 ba380ea615 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/price/PriceServiceTest.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
3 years ago
..
yudao-module-product-api Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
yudao-module-product-biz Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
yudao-module-promotion-api Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
yudao-module-promotion-biz Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
yudao-module-trade-api mall - trade - 新增 TradeDeliveryPriceCalculator 3 years ago
yudao-module-trade-biz Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 3 years ago
pom.xml 适配 mall 模块的 openapi 3 years ago