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

2023-06-03 20:55:45 +08:00

..

src/main/java/cn/iocoder/yudao/module/promotion

Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product

2023-06-03 20:55:45 +08:00

pom.xml

将 market 模块，调整成 promotion 模块

2022-10-30 17:37:07 +08:00