Merge branch 'feature/1101_field' into develop-new

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

@@ -454,6 +454,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 detailVo.setUserAvatar(sysUser.getAvatar());
             }
         }
+        detailVo.setSpeedBeatUnit(musicSheet1.getSpeedBeatUnit());
         detailVo.setCategoryId(musicSheet1.getMusicCategoryId()!=null?musicSheet1.getMusicCategoryId().toString():"");
         detailVo.setMusicPrice(musicSheet1.getMusicPrice());
         detailVo.setSubjectNames(musicSheet1.getSubjectNames());

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

@@ -93,5 +93,9 @@ public class MusicSheetDetailVo extends MusicSheet {
 
     @ApiModelProperty("内容平台分类ID")
     private String categoryId;
+
+
+    @ApiModelProperty("速度节拍类型")
+    private String speedBeatUnit;
 }
 

pom.xml

@@ -23,7 +23,7 @@
 		<google.zxing.version>3.4.0</google.zxing.version>
 		<redisson.version>3.11.5</redisson.version>
 		<maven.test.skip>true</maven.test.skip>
-		<cbs.version>1.0.19</cbs.version>
+		<cbs.version>1.0.21</cbs.version>
 		<microsvc.version>1.1.4</microsvc.version>
 	</properties>