zengyuanqixin to complish
basic salary standard action changed
ZYQX
Merge
zengyuanqixin
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem
NOTHING
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/com/sms/action/EmployeeAction.class
	build/classes/com/sms/action/SalaryAction.class
	build/classes/com/sms/action/SalaryStandardAction.class
	build/classes/com/sms/dao/IStartSalaryInfoDao.class
	build/classes/com/sms/dao/impl/StartSalaryInfoDaoImp.class
	build/classes/com/sms/entity/StartSalaryInfo.class
	build/classes/com/sms/service/IManageSalaryManage.class
	build/classes/com/sms/service/IProfSalaryManage.class
	build/classes/com/sms/service/IWorkerSalaryManage.class
	build/classes/com/sms/service/impl/ManageSalaryManageImp.class
zengyuanqixin managebufenjieshu