# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
