Merge branch 'feature/1219_opt' into develop-new

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

@@ -2627,6 +2627,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 .set(CourseSchedule::getEndTime, endTime)
                 .set(CourseSchedule::getFreeEndTime, freeEndTime)
         );
+        //修改开课时间
+        courseGroupService.getDao().updateCourseStartTime(courseSchedule.getCourseGroupId());
 
         if (CollectionUtils.isNotEmpty(studentPayments)) {
             SysUser teacher = sysUserService.getByUserId(teacherId);

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

@@ -391,6 +391,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     if (albumMusicRelate != null) {
                         record.setAlbumCategoryLevelId(albumMusicRelate.getAlbumCategoryLevelId());
                         record.setAlbumCategoryTypeId(albumMusicRelate.getAlbumCategoryTypeId());
+                        record.setAlbumSortNumber(albumMusicRelate.getSortNumber());
                     }
                 }
             }

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -326,7 +326,6 @@
             where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s
             where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
-        ,amr.sort_number_ as albumSortNumber
         from music_sheet t
         left join album_music_relate amr on t.id_ = amr.music_sheet_id_
         left join sys_user su on t.create_by_ = su.id_