# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-shoppingcart-sdk/pom.xml # assortment-shoppingcart-sdk/readme.md # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java # order-application-service/src/main/java/cn/freemud/service/AppOrderService.java # order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java # order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java # shopping-cart-application-service/pom.xml
