Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetAuthRecordServiceImpl.java

@@ -248,7 +248,6 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
         musicSheetAuthRecord.setMusicSheetId(musicSheet.getId());
         musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
-        musicSheetAuthRecord.setId(IdWorker.getId());
         return baseMapper.insert(musicSheetAuthRecord);
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -382,7 +382,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
     public MusicSheetDetailVo getCbsDetail(Long id) {
         MusicSheet musicSheet = this.baseMapper.get(id);
-        if (musicSheet == null || musicSheet.getDelFlag()) {
+        if (musicSheet == null) {
             throw new BizException("未找到曲目信息");
         }
         if(musicSheet.getCbsMusicSheetId() == null){