Merge remote-tracking branch 'origin/master'

mec-education/src/main/java/com/ym/mec/education/resp/StudentResp.java

@@ -58,8 +58,8 @@ public class StudentResp implements Serializable {
         private String classTime;
         @ApiModelProperty(value = "缴费状态，已缴费，待续费，已续费", example = "已续费")
         private String renewStatus;
-        @ApiModelProperty(value = "学校经纬度", example = "118.800454,32.083998")
-        private String schoolLongitudeLatitude;
+        @ApiModelProperty(value = "学校名称", example = "武汉市红领巾小学")
+        private String schoolName;
         @ApiModelProperty(value = "课程类别 1 乐团 2 vip", example = "1")
         private Integer courseType;
         @ApiModelProperty(value = "讲课老师", example = "张老师")

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseScheduleServiceImpl.java

@@ -258,7 +258,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
                         studentCourseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
                         School school = schoolService.getById(musicGroup.getSchoolId());
                         Optional.ofNullable(school).ifPresent(value -> studentCourseSchedule.
-                            setSchoolLongitudeLatitude(value.getLongitudeLatitude()));
+                            setSchoolName(value.getName()));
                     });
                     QueryWrapper<MusicGroupPaymentCalender> paymentCalenderQueryWrapper = new QueryWrapper<>();
                     paymentCalenderQueryWrapper.lambda().eq(MusicGroupPaymentCalender::getMusicGroupId, musicGroup.getId());
@@ -282,7 +282,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
                             studentCourseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
                             School school = schoolService.getById(vipGroupParam.getTeacherSchoolId());
                             Optional.ofNullable(school).ifPresent(value -> studentCourseSchedule.
-                                setSchoolLongitudeLatitude(value.getLongitudeLatitude()));
+                                setSchoolName(value.getName()));
                         });
                     }
                     studentCourseSchedule.setCourseType(2);