Merge branch 'feature/1210_audio' into test

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

@@ -2654,7 +2654,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
 
     /**
-     * @param musicSheetId 业务端曲目ID
+     *
      * @return CbsMusicSheetWrapper.MusicSheet
      */
     @Override
@@ -2726,6 +2726,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         cbsMusicSheet.setBizId(query.getMusicSheetId());
 
         MusicSheetWrapper.MusicSheetDetail musicSheetDetail = JSON.parseObject(JSON.toJSONString(cbsMusicSheet), MusicSheetWrapper.MusicSheetDetail.class);
+        musicSheetDetail.setId(query.getMusicSheetId().toString());
 
         MusicSheetDetailVo detail = musicSheetService.detail(query.getMusicSheetId().toString(), sysUser,query.getClient(), query.getTenantAlbumId());
         if (detail != null) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/MusicSheetWrapper.java

@@ -1143,8 +1143,6 @@ public class MusicSheetWrapper {
 
         @ApiModelProperty("主键")
         private String id;
-        @ApiModelProperty("业务平台曲目ID")
-        private Long bizId;
         @ApiModelProperty("曲目封面图")
         private String musicCover;
         @ApiModelProperty("曲目名称")