From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 17 Jun 2019 15:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/entity/Organization.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/Organization.java b/src/main/java/com/moral/entity/Organization.java
index 50295d7..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;
/**
@@ -88,7 +91,10 @@
* @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;
--
Gitblit v1.8.0