Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-28 e702400b2e1bfd27f6176ea95a5c4d130417a1a4

 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}