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

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

@@ -138,6 +138,7 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         albumDetailVo.setPaymentType(musicAlbum.getPaymentType());
         albumDetailVo.setMusicTagNames(musicTagService.getMusicTagNames(StringUtil.toLongList(musicAlbum.getAlbumTag())));
         albumDetailVo.setAuditVersion(musicAlbum.getAuditVersion());
+        albumDetailVo.setAlbumType(musicAlbum.getAlbumType());
 //        query.setMusicSheetType(musicAlbum.getAlbumType());
 
         // 新增专辑曲目查询条件

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/AlbumDetailVo.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.yonge.cooleshow.biz.dal.enums.MusicSheetTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.PageInfo;
@@ -76,6 +77,9 @@ public class AlbumDetailVo {
     @ApiModelProperty("支付订单号")
     private String orderNo;
 
+    @ApiModelProperty(value = "曲谱类型(SINGLE:单曲，CONCERT:合奏)")
+    private MusicSheetTypeEnum albumType;
+
     public YesOrNoEnum getAuditVersion() {
         return auditVersion;
     }
@@ -246,4 +250,12 @@ public class AlbumDetailVo {
     public void setMusicPaymentTypes(List<String> musicPaymentTypes) {
         this.musicPaymentTypes = musicPaymentTypes;
     }
+
+    public MusicSheetTypeEnum getAlbumType() {
+        return albumType;
+    }
+
+    public void setAlbumType(MusicSheetTypeEnum albumType) {
+        this.albumType = albumType;
+    }
 }