fit bug
add employeeDao employeeManage
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/com/sms/action/UserAction.class