Merge branch 'zx_saas_cbs_category' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -300,6 +300,8 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
             if(queryInfo.getSubjectId() == 5){
                 queryInfo.setSubjectIds(queryInfo.getSubjectIds() + ",6");
+            }else if (queryInfo.getSubjectId() == 6){
+                queryInfo.setSubjectIds(queryInfo.getSubjectIds() + ",5");
             }
         }
         if(CollectionUtils.isEmpty(queryInfo.getCategoriesIdList())){