Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -171,7 +171,9 @@ public class TenantAlbumController {
                         tenantAlbumSheet.setMusicTag(musicSheet.getMusicTag());
                         tenantAlbumSheet.setComposer(musicSheet.getComposer());
                         tenantAlbumSheet.setMusicSubject(musicSheet.getMusicSubject());
-
+                        tenantAlbumSheet.setMusicSubjectName(musicSheet.getSubjectNames());
+                        tenantAlbumSheet.setMusicTagName(musicSheet.getMusicTagNames());
+/*
                         //设置对应标签名称
                         String musicTag = tenantAlbumSheet.getMusicTag();
                         if (StringUtils.isNotBlank(musicTag)){
@@ -192,7 +194,7 @@ public class TenantAlbumController {
                                 return null;
                             }).filter(Objects::nonNull).collect(Collectors.joining(","));
                             tenantAlbumSheet.setMusicSubjectName(subjectName);
-                        }
+                        }*/
 
                     }
                     break;