# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/aop/WebAspect.java # order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java # ordercenter-sdk/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
