# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java
