其他分支的冲突

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

@@ -432,5 +432,7 @@ public interface MusicSheetService extends IService<MusicSheet> {
 
     CbsMusicSheetWrapper.MusicSheet cbsDetail(Long cbsMusicSheetId,Boolean simpleFlag);
 
+    CbsMusicSheetWrapper.MusicSheet cbsDetail(Long cbsMusicSheetId);
+
     IPage<MusicSheetWrapper.MusicSheetCloud> cloudPage(MusicSheetWrapper.MusicSheetCloudQuery query);
 }

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

@@ -2653,6 +2653,23 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         }
     }
 
+    /**
+     * @param musicSheetId 业务端曲目ID
+     * @return CbsMusicSheetWrapper.MusicSheet
+     */
+    @Override
+    public CbsMusicSheetWrapper.MusicSheet cbsDetail(Long cbsMusicSheetId) {
+        try {
+
+            R<CbsMusicSheetWrapper.MusicSheet> musicSheetR = musicFeignClientService.musicSheetDetail(cbsMusicSheetId , applicationId);
+
+            return musicSheetR.feignData();
+        } catch (Exception e) {
+            log.error("调用音乐服务异常", e);
+            throw new BizException("内容平台服务异常");
+        }
+    }
+
     @Override
     public IPage<MusicSheetWrapper.MusicSheetCloud> cloudPage(MusicSheetWrapper.MusicSheetCloudQuery query) {
         IPage<MusicSheetWrapper.MusicSheetCloud> musicSheetCloudIPage = musicSheetDao.cloudPage(QueryInfo.getPage(query), query);