Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-23 a4d06b1354d48d94c8e07d716863bcb7d3876a07

 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}