Merge branch 'saas_2022_05_17_activity' into master_saas

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

@@ -34,7 +34,6 @@
         where a.user_type_ like '%STUDENT%'
         and a.lock_flag_ = 0
         and a.del_flag_ = 0
-        and b.room_uid_ = #{param.roomUid}
         <if test="param.tenantId != null ">
             and tenant_id_ = #{param.tenantId}
         </if>