完成考试情况统计
Merge branch 'functions-updates' of
https://github.com/iamzhouyi/jxmanage into functions-updates

Conflicts:
	src/main/java/com/tgtjx/manage/service/report/ReportService.java
	src/main/java/com/tgtjx/manage/web/report/ReportController.java