levelsalarychange modified
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/.gitignore
	build/classes/com/sms/action/NewEmployeeAction.class
	build/classes/com/sms/action/UserAction.class
	build/classes/com/sms/entity/ExperienceInfo.class
	build/classes/com/sms/service/LevelSalaryChange.class
	modified:   build/classes/com/sms/action/BonusAction.class