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

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

@@ -308,6 +308,9 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         this.initCategoryIds(queryInfo);
         if(queryInfo.getSubjectId() != null){
             queryInfo.setSubjectIds(queryInfo.getSubjectId().toString());
+            if(queryInfo.getSubjectId() == 5){
+                queryInfo.setSubjectIds(queryInfo.getSubjectIds() + ",6");
+            }
         }
         if(CollectionUtils.isEmpty(queryInfo.getCategoriesIdList())){
             return new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -680,8 +680,9 @@ public class RoomServiceImpl implements RoomService {
                 continue;
             }
             studentMusicScore.setMusicScoreName(sheetApplication.getName());
-            studentMusicScore.setMp3Url(sheetApplication.getMp3Url());
-            studentMusicScore.setUrl(sheetApplication.getUrl());
+            //管乐迷的历史问题，原音和伴奏反过来
+            studentMusicScore.setMp3Url(sheetApplication.getUrl());
+            studentMusicScore.setUrl(sheetApplication.getMp3Url());
             courseScheduleStudentMusicScoreDao.update(studentMusicScore);
         }
     }