From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

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

diff --git a/screen-api/src/main/resources/mapper/GroupMapper.xml b/screen-api/src/main/resources/mapper/GroupMapper.xml
index 9fbdc8d..e54c082 100644
--- a/screen-api/src/main/resources/mapper/GroupMapper.xml
+++ b/screen-api/src/main/resources/mapper/GroupMapper.xml
@@ -12,11 +12,6 @@
         <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 g.id,g.group_name
         FROM `group` g,`user_group` ug

--
Gitblit v1.8.0