From 6349bdc821d42a926785efe12841e56fcafaaa32 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Sat, 6 May 2023 14:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82=E3=80=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B0=8F=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcNeighborHoodDTO.java   | 16 ++++++++++++++++
 .../dto/form/IcNeighborHoodAddFormDTO.java      | 17 ++++++++++++++++-
 .../com/epmet/entity/IcNeighborHoodEntity.java  | 17 +++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
index 8e39699670..66c41f6342 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java
@@ -165,4 +165,20 @@ public class IcNeighborHoodDTO implements Serializable {
      */
     private String buildingName;
 
+    /**
+     * 烟台需求：自然村/小区
+     */
+    private String viliageType;
+    /**
+     * 烟台需求：面积
+     */
+    private String area;
+    /**
+     * 烟台需求：开放类型
+     */
+    private String openType;
+    /**
+     * 烟台需求：建筑年代
+     */
+    private String buildYear;
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java
index 854462c6e1..f975c75048 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java
@@ -113,6 +113,21 @@ public class IcNeighborHoodAddFormDTO extends PageFormDTO {
      * 实有楼栋数
      */
     private Integer realBuilding;
-
+    /**
+     * 烟台需求：自然村/小区
+     */
+    private String viliageType;
+    /**
+     * 烟台需求：面积
+     */
+    private String area;
+    /**
+     * 烟台需求：开放类型
+     */
+    private String openType;
+    /**
+     * 烟台需求：建筑年代
+     */
+    private String buildYear;
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java
index 26e278fd16..2d67d4259b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java
@@ -121,4 +121,21 @@ public class IcNeighborHoodEntity extends BaseEpmetEntity {
 	 * 二维码地址
 	 */
 	private String qrcodeUrl;
+
+	/**
+	 * 烟台需求：自然村/小区
+	 */
+	private String viliageType;
+	/**
+	 * 烟台需求：面积
+	 */
+	private String area;
+	/**
+	 * 烟台需求：开放类型
+	 */
+	private String openType;
+	/**
+	 * 烟台需求：建筑年代
+	 */
+	private String buildYear;
 }