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	Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product	2023-09-25 15:06:57 +08:00
pom.xml	砍价活动: 完善 app 端获取活动分页、列表、详情接口	2023-09-19 16:35:21 +08:00