test
delete
test
基本框架
Merge branch 'new'
初始代码结构
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebContent/WEB-INF/web.xml
	build/classes/config/struts.xml
	src/config/struts.xml