From eb51b2364e9a3fbe806fde61fa255660a098fc8b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 24 Jun 2021 14:06:41 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

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

diff --git a/screen-api/src/main/resources/mapper/GroupMapper.xml b/screen-api/src/main/resources/mapper/GroupMapper.xml
index 9fbdc8d..36edc9d 100644
--- a/screen-api/src/main/resources/mapper/GroupMapper.xml
+++ b/screen-api/src/main/resources/mapper/GroupMapper.xml
@@ -12,12 +12,7 @@
         <result column="is_delete" property="isDelete"/>
     </resultMap>
 
-    <resultMap id="GroupResultMap" type="java.util.LinkedHashMap">
-        <id column="id" property="id"/>
-        <result column="group_name" property="groupName"/>
-    </resultMap>
-
-    <select id="selectUserGroup" resultMap="BaseResultMap">
+    <select id="selectUserGroup" resultMap="GroupResultMap">
         SELECT g.id,g.group_name
         FROM `group` g,`user_group` ug
         WHERE ug.user_id = #{userId}

--
Gitblit v1.8.0