# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-shoppingcart-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # shopping-cart-application-service/pom.xml
