Merge branch 'feature/20201110_混合支付退款_张志恒' into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1202,6 +1202,8 @@ public class OrderSdkAdapter {
             data.setMarketingType(ClassUtils.toByte(orderInfoReqs.getMarketingType()));
         }
 
+        data.setOrderPayItemCreateReqList(orderInfoReqs.getOrderPayItemCreateReqList());
+        data.setPickUpGoodsNo(orderInfoReqs.getPickUpGoodsNo());
         return data;
     }