Merge remote-tracking branch 'origin/master'

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamCertificationServiceImpl.java

@@ -84,7 +84,7 @@ public class ExamCertificationServiceImpl extends BaseServiceImpl<Long, ExamCert
 		needCheckingDetailDto.setWaitNum(waitNum);
 		needCheckingDetailDto.setDesc(sysConfigService.findConfigValue("exam_room_desc",needCheckingDetailDto.getTenantId()));
 		ExamRegistration examRegistration = examRegistrationDao.get(examRegistrationId);
-		needCheckingDetailDto.setSubjectName(subjectDao.get(examRegistration.getId()).getName());
+		needCheckingDetailDto.setSubjectName(subjectDao.get(examRegistration.getSubjectId()).getName());
 		needCheckingDetailDto.setLevel(examRegistration.getLevel());
 		return needCheckingDetailDto;
 	}