fix

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

@@ -355,13 +355,9 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         if (lessonCourseware == null) {
             throw new BizException("课件不存在");
         }
-<<<<<<< Updated upstream
-        LessonCoursewareWrapper.LessonCourseware lessonCoursewareDto = JSON.parseObject(JSON.toJSONString(lessonCourseware), LessonCoursewareWrapper.LessonCourseware.class);
-        lessonCoursewareDto.setStatus(false);
-=======
+
         LessonCoursewareWrapper.LessonCourseware lessonCoursewareDto = JSON.parseObject(JSON.toJSONString(lessonCourseware), LessonCoursewareWrapper.LessonCourseware.class);
         lessonCoursewareDto.setPlay(false);
->>>>>>> Stashed changes
 
         if (query.getClient() == ClientEnum.STUDENT) {
             // 判断学生有咩有购买