From a4d06b1354d48d94c8e07d716863bcb7d3876a07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 15:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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 1123a96..9fbdc8d 100644
--- a/screen-api/src/main/resources/mapper/GroupMapper.xml
+++ b/screen-api/src/main/resources/mapper/GroupMapper.xml
@@ -17,7 +17,7 @@
<result column="group_name" property="groupName"/>
</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