修改考试结果登记，根据学员身份证号登记
Merge branch 'master' of https://github.com/iamzhouyi/jxmanage

Conflicts:
	src/main/java/com/tgtjx/manage/repository/TestProcessDao.java
	src/main/java/com/tgtjx/manage/service/test/TestService.java