连接公用数据库显示所有工资标准
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/.gitignore