From ac5fe90a28e8749cc9f60bff1e4e20895f934d70 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 10 Jun 2020 15:31:12 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=9A=E7=BB=BC=E6=B2=BB=E7=9F=9B=E8=B0=83DTO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/conflict/ConflictMediateDTO.java | 24 +++++++++++++++++++
 .../conflict/form/ConflictMediateFormDTO.java |  5 ++++
 2 files changed, 29 insertions(+)

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;
+
     /**
      * 矛盾纠纷类型
      */