# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-shoppingcart-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/resources/application.properties # ordercenter-sdk/pom.xml # shopping-cart-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
