From 8a11e77464fefd072247fba1a24340f747ee21a8 Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Sat, 1 Apr 2017 18:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0groupordid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/base/common/dao/role/RolesMapper.xml      | 3 ++-
 .../src/main/java/com/lyms/base/common/entity/role/Roles.java        | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.xml
index ec34323..79ee5b9 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.xml
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.xml
@@ -10,6 +10,7 @@
 		<result column="REMARKS" property="remarks" />
 		<result column="SHORT_CODE" property="shortCode" />
 		<result column="ORG_ID" property="orgId" />
+		<result column="GROUPORG_ID" property="grouporgId" />
 		<result column="CREATE_ID" property="createId" />
 		<result column="CREATE_TIME" property="createTime" />
 		<result column="MODIFY_ID" property="modifyId" />
@@ -20,6 +21,6 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, TYPE AS type, NAME AS name, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable
+        ID AS id, TYPE AS type, NAME AS name, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, GROUPORG_ID AS grouporgId, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable
     </sql>
 </mapper>
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java
index 3d3fbd5..ef6faad 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java
@@ -50,6 +50,11 @@ public class Roles implements Serializable {
 	@TableField(value="ORG_ID")
 	private String orgId;
 	/**
+	 * 机构组id
+	 */
+	@TableField(value="GROUPORG_ID")
+    private String grouporgId;
+	/**
 	 * 
 	 */
 	@TableField(value="CREATE_ID")
-- 
1.8.3.1