From cdcdbb62ff800c9f1802c57b4d45b98c79f517d5 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 24 Oct 2019 15:11:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=92=8C=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/UserGridRelationDTO.java    | 30 +++++++++++++++++
 .../epdc/entity/UserGridRelationEntity.java   | 32 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridRelationDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridRelationDTO.java
index 82472d295..5aa9c28ba 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridRelationDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserGridRelationDTO.java
@@ -43,6 +43,36 @@ public class UserGridRelationDTO implements Serializable {
      */
 	private String userId;
 
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 区县ID
+     */
+    private Long districtId;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 街道ID
+     */
+    private Long streetId;
+
+    /**
+     * 社区
+     */
+    private String community;
+
+    /**
+     * 社区ID
+     */
+    private Long communityId;
+
     /**
      * 所属网格
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java
index 1fc15e069..8ba5b84bc 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java
@@ -36,13 +36,43 @@ import java.util.Date;
 @TableName("epdc_user_grid_relation")
 public class UserGridRelationEntity extends BaseEpdcEntity {
 
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 8308463158510832072L;
 
     /**
      * 用户ID
      */
 	private String userId;
 
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 区县ID
+     */
+    private Long districtId;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 街道ID
+     */
+    private Long streetId;
+
+    /**
+     * 社区
+     */
+    private String community;
+
+    /**
+     * 社区ID
+     */
+    private Long communityId;
+
     /**
      * 所属网格
      */