basic salary
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/com/sms/dao/IManageSalaryDao.class
	build/classes/com/sms/dao/impl/ManageSalaryDaoImp.class
	build/classes/com/sms/service/impl/ProfSalaryManageImp.class
	build/classes/com/sms/service/impl/WorkerSalaryManageImp.class
	src/com/sms/dao/IManageSalaryDao.java
	src/com/sms/dao/impl/ManageSalaryDaoImp.java