Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa

# Conflicts:
#	order-management/pom.xml

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -811,6 +811,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
             request.setOrderClient(OrderClientType.SAAS.getIndex());
             request.setCancelReason(cancelOrderRequest.getReason());
+            request.setAfterSalesReason(cancelOrderRequest.getReason());
             //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
             request.setCreateEvent(4);
             request.setOperator(cancelOrderRequest.getOperator());

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.18-SNAPSHOT</version>
+            <version>2.0.22-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>