-
Merge branch 'feature/2020/09/07-1.9.38-自主积分新增撤单功能-张志恒' into develop · fb8c6e22
# Conflicts: # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
zhiheng.zhang committed