Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'qa' of…
Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
Showing
Please
register
or
sign in
to comment