Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -93,7 +93,7 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 				List<CourseSchedule> list = new ArrayList<CourseSchedule>();
 
 				for (CoursesScheduleHistory his : coursesScheduleHistoryList) {
-					if (his.getBefore().getType() == CourseScheduleType.VIP || his.getBefore().getType() == CourseScheduleType.LIVE) {
+					if (his.getBefore().getType() == CourseScheduleType.VIP) {
 						if(!teacherLeaveRecord.getEndTime().before(his.getAfter().getStartClassTime())
 								&&!teacherLeaveRecord.getStartTime().after(his.getAfter().getEndClassTime())){
 							throw new BizException("课程时间与老师请假时间存在冲突");