From e702400b2e1bfd27f6176ea95a5c4d130417a1a4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Jun 2021 11:20:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

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

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

--
Gitblit v1.8.0