Merge branch 'saas_2022_05_17_activity' into master_saas

# Conflicts:
#	mec-biz/src/main/resources/config/mybatis/ImLiveRoomBlackMapper.xml

mec-biz/src/main/resources/config/mybatis/ImLiveRoomBlackMapper.xml

@@ -25,12 +25,12 @@
     </insert>
 
     <select id="queryStudent" parameterType="object" resultType="com.ym.mec.auth.api.entity.SysUser">
-        select distinct id_        as id,
+        select id_        as id,
         username_  as username,
         real_name_ as realName,
         phone_     as phone
         from sys_user
-        where find_in_set('STUDENT', a.user_type_)
+        where find_in_set('STUDENT', user_type_)
         and lock_flag_ = 0
         and del_flag_ = 0
         and tenant_id_ = 1