Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1022,7 +1022,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         StringBuffer errInfo = new StringBuffer("在");
         errInfo.append(DateUtil.dateToString(courseSchedules.get(1).getStartClassTime(), "yyyy-MM-dd HH:mm"));
         errInfo.append("至");
-        errInfo.append(DateUtil.dateToString(courseSchedules.get(0).getEndClassTime(), "yyyy-MM-dd HH:mm"));
+        errInfo.append(DateUtil.dateToString(courseSchedules.get(0).getEndClassTime().before(courseSchedules.get(1).getEndClassTime())?courseSchedules.get(0).getEndClassTime():courseSchedules.get(1).getEndClassTime(), "yyyy-MM-dd HH:mm"));
         errInfo.append("的时间段内");
         errInfo.append("安排的课程存在冲突,");
         errInfo.append("冲突课程为：");