From 583d3ff551f95f7e1b821f459f892e8fb7e0f72b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 16 Aug 2019 16:18:14 +0800
Subject: [PATCH] 修正重合点弹窗关闭按钮的位置

---
 src/main/java/com/moral/entity/Organization.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/entity/Organization.java b/src/main/java/com/moral/entity/Organization.java
index 2449152..eb237bb 100644
--- a/src/main/java/com/moral/entity/Organization.java
+++ b/src/main/java/com/moral/entity/Organization.java
@@ -1,8 +1,12 @@
 package com.moral.entity;
 
 import java.util.Date;
+import java.util.Map;
 
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Transient;
 
 import lombok.Data;
 
@@ -13,6 +17,7 @@
 	 * @mbggenerated  Thu Dec 07 15:18:16 CST 2017
 	 */
 	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer id;
 
 	/**
@@ -86,5 +91,11 @@
 	 * @mbggenerated  Thu Dec 07 15:18:16 CST 2017
 	 */
 	private String description;
+	private Long townCode;
+	private Long villageCode;
+	@Transient
+	private Integer parentId;
+    @Transient
+	private AreaNames areaNames;
 
 }
\ No newline at end of file

--
Gitblit v1.8.0