9c0d0c809a
Conflicts: yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java 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/order/TradeOrderUpdateServiceImpl.java |
||
---|---|---|
.. | ||
yudao-module-product-api | ||
yudao-module-product-biz | ||
yudao-module-promotion-api | ||
yudao-module-promotion-biz | ||
yudao-module-trade-api | ||
yudao-module-trade-biz | ||
pom.xml |