Merge remote-tracking branch 'origin/master'

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

@@ -500,7 +500,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				dataList.forEach(vipGroup -> {
 					Integer overCourses = vipGroupOverCourseMaps.get(vipGroup.getId().toString());
 					ClassGroup classGroup = vipGroupClassGroupMap.get(vipGroup.getId().toString());
-					vipGroup.setStudentNum(classGroup.getStudentNum());
+					if(Objects.nonNull(classGroup)){
+						vipGroup.setStudentNum(classGroup.getStudentNum());
+					}
 
 					Long aLong = totalClassTimeMap.get(vipGroup.getId() + "");
 					vipGroup.setTotalClassTimes(aLong==null?0:aLong.intValue());

mec-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -147,7 +147,7 @@
 
 	<resultMap id="StudentAttendanceStatisticsResp" type="com.ym.mec.biz.dal.dto.StudentAttendanceStatisticsResponse">
 		<result property="userId" column="user_id_"/>
-		<result property="studentName" column="real_name_"/>
+		<result property="studentName" column="username_"/>
 	</resultMap>
 
 	<select id="findStudentByClassGroup" resultMap="StudentAttendanceStatisticsResp">