From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

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

diff --git a/src/main/java/com/moral/entity/Organization.java b/src/main/java/com/moral/entity/Organization.java
index e727199..eb237bb 100644
--- a/src/main/java/com/moral/entity/Organization.java
+++ b/src/main/java/com/moral/entity/Organization.java
@@ -3,6 +3,8 @@
 import java.util.Date;
 import java.util.Map;
 
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Transient;
 
@@ -15,6 +17,7 @@
 	 * @mbggenerated  Thu Dec 07 15:18:16 CST 2017
 	 */
 	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer id;
 
 	/**
@@ -90,27 +93,6 @@
 	private String description;
 	private Long townCode;
 	private Long villageCode;
-
-	public Integer getProvinceCode() {
-		return provinceCode==null?0:provinceCode;
-	}
-
-	public Integer getCityCode() {
-		return cityCode==null?0:cityCode;
-	}
-
-	public Integer getAreaCode() {
-		return areaCode==null?0:areaCode;
-	}
-
-	public Long getTownCode() {
-		return townCode==null?0:townCode;
-	}
-
-	public Long getVillageCode() {
-		return villageCode==null?0:villageCode;
-	}
-
 	@Transient
 	private Integer parentId;
     @Transient

--
Gitblit v1.8.0