Merge branch 'online1'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

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

@@ -241,7 +241,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (detailDto.getMusicalName() != null) {
             StudentFeeDto studentFeeDto = new StudentFeeDto();
             studentFeeDto.setGoodsName(detailDto.getMusicalName());
-            studentFeeDto.setGoodsType("MUSICAL");
+            studentFeeDto.setGoodsType("INSTRUMENT");
             studentFeeDto.setMusicalFee(detailDto.getMusicalAmount());
             studentFeeDtos.add(studentFeeDto);
         }

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

@@ -287,6 +287,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){
 						throw new BizException("此课程没有学生");
 					}
+
 					//排除不被服务学员
 //					Set<Integer> serveStudentIds = studentServeService.getStudentWithCourse(teacherAttendance.getCourseScheduleId());
 //					Iterator<StudentCourseHomework> iterator = studentCourseHomeworks.iterator();