Selaa lähdekoodia

审核bug修复

wangtong 1 vuosi sitten
vanhempi
commit
0ca598b6e1

+ 13 - 10
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringCivilExportVo.java

@@ -155,7 +155,7 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
     /**
      * 施工地址
      */
-    @ExcelProperty(value = "施工地址")
+    @ExcelProperty(value = "施工位置")
     private String constructAddre;
 
     /**
@@ -176,24 +176,18 @@ public class ZEngineeringCivilExportVo extends BaseEntity implements Serializabl
     @ExcelProperty(value = "回填时间")
     private Date backfillTime;
 
-    /**
-     * 施工人电话
-     */
-    @ExcelProperty(value = "施工人电话")
-    private String constructPhone;
+
 
     /**
      * 施工人
      */
-    @ExcelProperty(value = "施工人")
+
     private String constructUser;
 
     /**
      * 施工时间
      */
-    @ExcelProperty(value = "施工时间")
-//    @JsonFormat("yyyy-MM-dd HH:mm:ss")
-    private Date constructTime;
+
 
     /**
      * 负责人名称
@@ -274,5 +268,14 @@ private Date updateInfoTime;
      */
    // @TableField(fill = FieldFill.INSERT)
     //@ExcelProperty(value = "施工人")
+    @ExcelProperty(value = "施工人")
     private String createBy;
+    @ExcelProperty(value = "施工时间")
+//    @JsonFormat("yyyy-MM-dd HH:mm:ss")
+    private Date constructTime;
+    /**
+     * 施工人电话
+     */
+    @ExcelProperty(value = "施工人电话")
+    private String constructPhone;
 }