From 2e504f716d594ae245681e21e5e786f1d56f4739 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 24 Jun 2020 10:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E8=B6=A3=E7=BE=A4=E5=B8=B8=E9=87=8F+D?=
 =?UTF-8?q?TO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/constant/GroupConstant.java      |  5 +++++
 .../com/elink/esua/epdc/dto/group/GroupDTO.java    | 10 ++++++++++
 .../esua/epdc/dto/group/GroupManagementDTO.java    | 14 ++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/GroupConstant.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/GroupConstant.java
index f63899f..d38318a 100644
--- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/GroupConstant.java
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/constant/GroupConstant.java
@@ -24,6 +24,11 @@ public interface GroupConstant {
     String POLICE_GROUP_CATEGORY_CODE = "property_group";
     String POLICE_GROUP_TYPE = "grid_party";
 
+    /**
+     * 物业群所属类别，兴趣
+     */
+    String INTEREST_GROUP_CATEGORY_CODE = "interest_group";
+
     /**
      * 物业群默认头像
      */
diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/GroupDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/GroupDTO.java
index 2f863c4..806fac0 100644
--- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/GroupDTO.java
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/GroupDTO.java
@@ -114,6 +114,16 @@ public class GroupDTO implements Serializable {
      */
 	private Long gridId;
 
+    /**
+     * 网格（新）
+     */
+    private String deptName;
+
+    /**
+     * 网格ID（新）
+     */
+    private Long deptId;
+
     /**
      * 状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散
      */
diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/GroupManagementDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/GroupManagementDTO.java
index 51e179d..ab42a7c 100644
--- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/GroupManagementDTO.java
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/group/GroupManagementDTO.java
@@ -33,6 +33,16 @@ public class GroupManagementDTO implements Serializable {
      */
     private String groupCategory;
 
+    /**
+     * 所属版块编码
+     */
+    private String sectionCode;
+
+    /**
+     * 社群类别编码
+     */
+    private String categoryCode;
+
     /**
      * 状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散
      */
@@ -48,4 +58,8 @@ public class GroupManagementDTO implements Serializable {
      */
     private String nickname;
 
+    /***
+     *所有部门名称
+     */
+    private String allDeptNames;
 }