Excel export modified
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	build/classes/.gitignore
	build/classes/com/sms/action/UserAction.class
	build/classes/config/applicationContext-beans.xml
	build/classes/config/applicationContext-common.xml
	build/classes/config/struts-user.xml
	src/com/sms/action/UserAction.java
	src/config/applicationContext-beans.xml
	src/config/applicationContext-common.xml
	src/config/struts-user.xml