Merge branch 'grade_feature' into test

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

@@ -1343,7 +1343,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         update(studentRegistration);
         studentRegistrationDao.updateUser(student.getUserId(),student.getName(), student.getParentsName(), student.getIdCardNo(), student.getGender(),studentRegistration.getCertificateType());
         //更新年级信息
-        Student studentInfo = studentDao.get(studentRegistration.getUserId());
+        Student studentInfo = studentDao.get(student.getUserId());
         studentInfo.setCurrentGradeNum(studentRegistration.getCurrentGradeNum());
         studentInfo.setCurrentClass(studentRegistration.getCurrentClass());
         studentDao.update(studentInfo);