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

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderBaseVO.java

@@ -162,8 +162,8 @@ public class OrderBaseVO     {
     @ApiModelProperty(value = "所属销司")
     private String buyName;
 
-    @ApiModelProperty(value = "销售类型")
-    private String salesTypeName;
+ /*   @ApiModelProperty(value = "销售类型")
+    private String salesTypeName;*/
 
     @ApiModelProperty(value = "要求状态")
     private String reqStatus;