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

mall-server-api/src/main/java/com/gree/mall/manager/bean/quality/QualityFeedbackVO.java

@@ -41,9 +41,14 @@ public class QualityFeedbackVO {
     @ApiModelProperty(value = "反馈网点名称")
     private String websitName;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
+    @ApiModelProperty(value = "内机条码")
+    private String insideCode;
+
+    @ApiModelProperty(value = "外机条码")
+    private String outCode;
+
+    @ApiModelProperty(value = "产品大类名称")
+    private String mainName;
 
     @ApiModelProperty(value = "云售后4.0工单号")
     private String orderNo;
@@ -99,9 +104,6 @@ public class QualityFeedbackVO {
     @ApiModelProperty(value = "产品大类")
     private String mainId;
 
-    @ApiModelProperty(value = "产品大类名称")
-    private String mainName;
-
     @ZfireField(type = "select", frontCode = "PRODUCT_SUBCLASS")
     @ApiModelProperty(value = "产品小类")
     private String smallId;
@@ -118,12 +120,6 @@ public class QualityFeedbackVO {
     @ApiModelProperty(value = "外机型号")
     private String outProductName;
 
-    @ApiModelProperty(value = "内机条码")
-    private String insideCode;
-
-    @ApiModelProperty(value = "外机条码")
-    private String outCode;
-
     @ApiModelProperty(value = "数量")
     private Integer num;
 
@@ -164,6 +160,10 @@ public class QualityFeedbackVO {
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
     @ApiModelProperty(value = "网点提交人")
     private String submitBy;