Merge branch 'feature/0721-tenant' into develop

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
+import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Date;
@@ -603,6 +604,12 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         String describe = tenantAlbum.getDescribe();
         //声部
         String subjectTypes = tenantAlbum.getSubjectTypes();
+        //原价
+        BigDecimal costPrice = tenantAlbum.getCostPrice();
+        //售价
+        BigDecimal salePrice = tenantAlbum.getSalePrice();
+        //周期
+        Integer purchaseCycle = tenantAlbum.getPurchaseCycle();
 
         album.setId(String.valueOf(tenantAlbum.getId()));
         album.setName(name);
@@ -610,6 +617,9 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         album.setMusicNum(size);
         album.setDescribe(describe);
         album.setSubjectTypes(subjectTypes);
+        album.setCostPrice(costPrice);
+        album.setPurchaseCycle(purchaseCycle);
+        album.setSalePrice(salePrice);
         return album;
     }