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

jinpengyong

2021-06-24 06b00a178d194d33370e44410c4f04a4164f86c7

 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}