puhui999 bce96b29a6 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ...

# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateReqBO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/bo/TradePriceCalculateRespBO.java

2023-09-25 15:06:57 +08:00

..

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

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

2023-09-25 15:06:57 +08:00

pom.xml

页面装修数据结构定义

2023-06-23 10:53:29 +08:00