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/MusicSheetServiceImpl.java

@@ -458,6 +458,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             }
         }
         detailVo.setSpeedBeatUnit(musicSheet1.getSpeedBeatUnit());
+        if (musicSheet1.getScoreType() !=null) {
+            detailVo.setScoreType(musicSheet1.getScoreType().name());
+        }
+        if (musicSheet1.getIsConvertibleScore() !=null) {
+            detailVo.setNotation(musicSheet1.getIsConvertibleScore()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
         detailVo.setCategoryId(musicSheet1.getMusicCategoryId()!=null?musicSheet1.getMusicCategoryId().toString():"");
         detailVo.setMusicPrice(musicSheet1.getMusicPrice());
         detailVo.setSubjectNames(musicSheet1.getSubjectNames());