Merge branch 'feature/0511-live' into master_saas

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

@@ -53,6 +53,7 @@
         <if test="param.search != null ">
             AND (
             a.user_id_ LIKE CONCAT('%', #{param.search},'%')
+            OR a.visitor_name_ LIKE CONCAT('%', #{param.search},'%')
             OR su.username_ LIKE CONCAT('%', #{param.search},'%')
             )
         </if>

mec-student/src/main/java/com/ym/mec/student/config/ResourceServerConfig.java

@@ -48,7 +48,8 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 "/musicGroup/getGradeList",
                 "/studentCompetition/get","/musicGroup/preRegister",
                 "/tenantInfo/queryTenantInfoByOrgan/**",
-                "/subject/list","/tenantApply/add","/questionnaireUserResult/add","/questionnaireTopic/getDetail", "/open/**",
+                "/subject/list","/tenantApply/add","/questionnaireUserResult/add","/questionnaireTopic/getDetail",
+                "/open/**", "/liveGoodsMapper/page", "/liveGoodsMapper/getGoodsDetail",
                 "/musicEnlightenmentQuestionnaire/addEnlightenmentQuestionnaire", "/musicEnlightenmentQuestionnaire/getUserMusicEnlightenmentQuestionnaire").permitAll().anyRequest().authenticated().and().httpBasic();
     }