Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -188,12 +189,12 @@ public class CreateOrderVo {
     @Builder.Default
     private String menuType = "saas";
     /**
-     * 渠道类型 OrderChannelType 
+     * 渠道类型 OrderChannelType
      */
     private Byte channelType;
-    
+
     /**
-     * 微信配送地址信息 
+     * 微信配送地址信息
      */
     private WeixinDeliveryAddressDto weixinDeliveryAddress;