Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/TenantAlbumVo.java

@@ -66,12 +66,6 @@ public class TenantAlbumVo {
         @ApiModelProperty("原价")
         private BigDecimal costPrice;
 
-        @ApiModelProperty("类型")
-        private String type;
-
-        @ApiModelProperty("级别")
-        private String level;
-
         @ApiModelProperty("曲目相关信息")
         private List<MusicSheetData> musicSheetData = new ArrayList<>();
 
@@ -94,6 +88,14 @@ public class TenantAlbumVo {
 
         @ApiModelProperty("声部id列表")
         private List<Long> musicSheetIdList = new ArrayList<>();
+
+        @ApiModelProperty("类型")
+        private String type;
+
+        @ApiModelProperty("级别")
+        private String level;
+
+
     }
 
     @Data