Merge remote-tracking branch 'origin/seec' into seec

# Conflicts:
#	seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/ExamService.java
#	seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/ExamController.java