新增工资计算公式
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/com/sms/entity/ExperienceInfo.class
	build/classes/com/sms/service/LevelSalaryChange.class
	build/classes/config/applicationContext-beans.xml
	src/config/applicationContext-beans.xml
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem