Merge branch 'dev-v5.2' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -49,7 +49,7 @@ public class ClassPeriodStudentVo {
 	/** 学员编码 */
 	@Excel(name = "学员姓名")
 	@ApiModelProperty("学员姓名")
-	private String realName;
+	private String realname;
 
 
 	/** 学员编码 */

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="id"/>
         <result property="gradeId" column="grade_id"/>
         <result property="studentCode" column="user_account"/>
-        <result property="realName" column="realname"/>
+        <result property="realname" column="realname"/>
         <result property="idCard" column="id_card"/>
         <result property="telPhone" column="telphone"/>
         <result property="userStatus" column="user_status"/>