bonus
a
worker salary change added
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	build/classes/.gitignore
	build/classes/com/sms/action/NewEmployeeAction.class
	build/classes/com/sms/action/SalaryAction.class
	build/classes/com/sms/action/UserAction.class
	build/classes/com/sms/dao/ISalaryDao.class
	build/classes/com/sms/dao/impl/SalaryDaoImp.class
	build/classes/com/sms/entity/Salary.class
	build/classes/com/sms/security/Md5.class
	build/classes/com/sms/service/IProfSalaryManage.class
	build/classes/com/sms/service/ISalaryManage.class
	build/classes/com/sms/service/IWorkerSalaryManage.class
	build/classes/com/sms/service/impl/ProfSalaryManageImp.class
	build/classes/com/sms/service/impl/SalaryManageImp.class
	build/classes/com/sms/service/impl/WorkerSalaryManageImp.class
	build/classes/config/applicationContext-beans.xml
	src/config/applicationContext-beans.xml
worker salary change modified