Merge remote-tracking branch 'origin/master'

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -217,10 +217,11 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
     /**
      * 维修图片
      */
-    private List<SysFile>  repairFileList;
+    private List<SysFile> repairFileList;
     /**
      * 验收图片
      */
-    private List<SysFile>  checkFileList;
+    private List<SysFile> checkFileList;
 
+    private String actualUser;
 }

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -169,6 +169,8 @@ public class RepairApplicationForm implements Serializable {
      * 更新人
      */
     private String updateUserId;
+
+    private String actualUser;
     /**
      * 报修人
      */

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -230,4 +230,6 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      * 验收图片
      */
     private List<SysFile>  checkFileList;
+
+    private String actualUser;
 }