Merge branch 'feature/0904_music' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -106,10 +106,6 @@ public class TenantAlbumController {
             throw new BizException("专辑信息不存在");
         }
 
-
-        TenantAlbumWrapper.TenantAlbum vo = JSON.parseObject(JSON.toJSONString(tenantAlbum),
-            TenantAlbumWrapper.TenantAlbum.class);
-
         List<TenantAlbumMusic> tenantAlbumMusics = tenantAlbumMusicService.lambdaQuery()
             .eq(TenantAlbumMusic::getTenantAlbumId, id)
             .eq(TenantAlbumMusic::getSubjectType, SubjectTypeEnum.valueOf(subjectType))
@@ -153,8 +149,7 @@ public class TenantAlbumController {
             sheetData.setSubjectType(key);
             tenantAlbumSheets.addAll(value.stream().map(next -> {
 
-                TenantAlbumWrapper.TenantAlbumSheet tenantAlbumSheet = new TenantAlbumWrapper.TenantAlbumSheet();
-                BeanUtils.copyProperties(next, tenantAlbumSheet);
+                TenantAlbumWrapper.TenantAlbumSheet tenantAlbumSheet =JSON.parseObject(JSON.toJSONString(next), TenantAlbumWrapper.TenantAlbumSheet.class);
                 Long musicSheetId = tenantAlbumSheet.getMusicSheetId();
                 switch (key) {
                     case COURSEWARE: