Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1876,8 +1876,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setTeachMode(teachMode);
                 courseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
-                if (classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MIX)) {
-                    courseSchedule.setName(classGroup4MixDto.getCourseType().getMsg());
+                if (!StringUtils.isBlank(classGroup.getName())) {
+                    courseSchedule.setName(classGroup.getName());
                 } else {
                     courseSchedule.setName(subjectNames + "-" + classGroup4MixDto.getCourseType().getMsg());
                 }