Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitTradeVO.java

@@ -2,6 +2,7 @@ package com.gree.mall.manager.bean.material.manage;
 
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.IsYesNoEnum;
+import com.gree.mall.manager.enums.material.PayOrderTypeEnum;
 import com.gree.mall.manager.enums.material.PayTypeEnum;
 import com.gree.mall.manager.enums.material.SalesPayOrderSourceEnum;
 import io.swagger.annotations.ApiModel;
@@ -30,8 +31,8 @@ public class WebsitTradeVO {
 //    @ApiModelProperty(value = "商品类型")
 //    private WebsitGoodsTypeEnum goodsType;
 //
-//    @ApiModelProperty(value = "订单类型")
-//    private PayOrderTypeEnum orderType;
+    @ApiModelProperty(value = "订单类型")
+    private PayOrderTypeEnum orderType;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "订单来源")