Merge branch 'feature/0721-tenant' into develop

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

@@ -220,6 +220,9 @@ public class TenantAlbumMusicWrapper {
             @ApiModelProperty("1:收藏 0:未收藏")
             private boolean favorite;
 
+            @ApiModelProperty("声谱类型，SINGLE:单曲，CONCERT:合奏")
+            private String musicSheetType;
+
             public String jsonString() {
                 return JSON.toJSONString(this);
             }

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -26,6 +26,7 @@
         m.music_subject_ as musicSubject,
         m.title_img_ as titleImg,
         m.exquisite_flag_ as exquisiteFlag,
+        m.music_sheet_type_ as musicSheetType,
         u.username_ as userName,
         s.name_ as musicSubjectName
 		FROM music_sheet m