Employee表
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem
Add Database
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/config/applicationContext-common.xml
	src/config/applicationContext-common.xml
test
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/com/sms/action/LoginAction.class
	build/classes/com/sms/action/UserAction.class
	build/classes/config/applicationContext-common.xml
	src/com/sms/action/LoginAction.java
	src/com/sms/action/UserAction.java
	src/config/applicationContext-common.xml
debug