教师查询OK
修改properties文件
Merge branch 'master' of https://github.com/hbezlls/schoolApplication

Conflicts:
	project.properties