# Conflicts: # order-application-service/src/main/java/cn/freemud/OrderApplication.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java # order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
