From ef3a45a366ea8451f2581547fa6a3894bd1d672f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

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

diff --git a/src/main/java/com/moral/entity/Organization.java b/src/main/java/com/moral/entity/Organization.java
index 231c026..eb237bb 100644
--- a/src/main/java/com/moral/entity/Organization.java
+++ b/src/main/java/com/moral/entity/Organization.java
@@ -3,7 +3,10 @@
 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;
 
@@ -14,6 +17,7 @@
 	 * @mbggenerated  Thu Dec 07 15:18:16 CST 2017
 	 */
 	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer id;
 
 	/**
@@ -87,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