From 54cb34eeb138ce367f934fc419891c6374a49dde Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 22 May 2020 17:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E8=AD=A6=E4=BF=A1=E6=81=AF=E5=8F=8A?=
 =?UTF-8?q?=E8=AD=A6=E6=B0=91=E7=BE=A4=E4=BF=A1=E6=81=AFDTO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/police/form/PoliceFormDTO.java   |  4 +-
 .../dto/police/result/PoliceResultDTO.java    | 53 +++++++++++++++++--
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/police/form/PoliceFormDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/police/form/PoliceFormDTO.java
index 6889607..1f5c2f4 100644
--- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/police/form/PoliceFormDTO.java
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/police/form/PoliceFormDTO.java
@@ -5,10 +5,10 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 物业项目列表Form DTO
+ * 警民相关信息Form DTO
  *
  * @Author：zhangyuan
- * @Date：2020/5/13 16:07
+ * @Date：2020/5/21 16:07
  */
 @Data
 public class PoliceFormDTO implements Serializable {
diff --git a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/police/result/PoliceResultDTO.java b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/police/result/PoliceResultDTO.java
index 5d3aa07..4cc8057 100644
--- a/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/police/result/PoliceResultDTO.java
+++ b/epdc-cloud-property-client/src/main/java/com/elink/esua/epdc/dto/police/result/PoliceResultDTO.java
@@ -10,12 +10,57 @@ public class PoliceResultDTO implements Serializable {
     private static final long serialVersionUID = -4978924751646345443L;
 
     /**
-     * 物业项目id
+     * 民警头像地址
      */
-    private String id;
+    private String policeAvatar;
 
     /**
-     * 物业项目名称
+     * 民警id
      */
-    private String projectName;
+    private String policeId;
+
+    /**
+     * 民警名称
+     */
+    private String policeName;
+
+    /**
+     * 民警电话
+     */
+    private String policeTel;
+
+    /**
+     * 群ID
+     */
+    private String groupId;
+
+    /**
+     * 物业群名称
+     */
+    private String groupName;
+
+    /**
+     * 物业群头像
+     */
+    private String groupAvatar;
+
+    /**
+     * 物业群成员数
+     */
+    private Integer numberGroupMember;
+
+    /**
+     * 社群内党员数
+     */
+    private Integer numberGroupPartyMember;
+
+    /**
+     * 用户对物业群的状态 '0' 未申请，'1'已申请待审核 ，'2'审核通过
+     */
+    private String groupMemberFlag;
+
+    /**
+     * 状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散
+     */
+    private String groupState;
 }