diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/ConflictMediateDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/ConflictMediateDTO.java
index 79e1484..7546583 100644
--- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/ConflictMediateDTO.java
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/ConflictMediateDTO.java
@@ -43,6 +43,11 @@ public class ConflictMediateDTO implements Serializable {
      */
 	private Long userId;
 
+    /**
+     * 提交人
+     */
+    private String userName;
+
     /**
      * 矛盾纠纷类型
      */
@@ -123,4 +128,23 @@ public class ConflictMediateDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 父所有部门
+     */
+    private String parentDeptIds;
+
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+
+    /**
+     * 所有部门名称
+     */
+    private String allDeptNames;
 }
\ No newline at end of file
diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateFormDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateFormDTO.java
index d11a5d3..9a6dfe8 100644
--- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateFormDTO.java
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/conflict/form/ConflictMediateFormDTO.java
@@ -40,6 +40,11 @@ public class ConflictMediateFormDTO implements Serializable {
      */
 	private Long userId;
 
+    /**
+     * 提交人
+     */
+    private String userName;
+
     /**
      * 矛盾纠纷类型
      */