# Conflicts: # assortment-ordercenter-sdk/pom.xml # 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/dto/order/CreatePrepayRequestDto.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java # ordercenter-sdk/pom.xml
