From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-api/src/main/resources/mapper/GroupMapper.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/GroupMapper.xml b/screen-api/src/main/resources/mapper/GroupMapper.xml
index 356729c..1123a96 100644
--- a/screen-api/src/main/resources/mapper/GroupMapper.xml
+++ b/screen-api/src/main/resources/mapper/GroupMapper.xml
@@ -15,7 +15,6 @@
     <resultMap id="GroupResultMap" type="java.util.LinkedHashMap">
         <id column="id" property="id"/>
         <result column="group_name" property="groupName"/>
-        <result column="organization_id" property="organizationId"/>
     </resultMap>
 
     <select id="selectUserGroup" resultMap="GroupResultMap">

--
Gitblit v1.8.0