modified:   src/config/struts-user.xml
aa

Signed-off-by: SYSU-Jmiao <jmiao@mail2.sysu.edu.cn>
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/Employee.jsp
	build/classes/.gitignore
	build/classes/com/sms/action/EmployeeAction.class
	build/classes/com/sms/action/NewEmployeeAction.class
	build/classes/com/sms/action/UserAction.class
	build/classes/com/sms/entity/Employee.class
	build/classes/config/struts-user.xml
	src/com/sms/action/EmployeeAction.java
	src/com/sms/entity/Employee.java
	src/com/sms/util/ExcelUtil.java
	src/config/struts-user.xml
A
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/Employee.jsp
	WebContent/js/employee.js
	build/classes/com/sms/action/BonusAction.class
	build/classes/com/sms/action/EmployeeAction.class
	build/classes/com/sms/action/SalaryStandardAction.class
	build/classes/com/sms/entity/Employee.class
	build/classes/config/struts-user.xml
	src/com/sms/action/bonusAction.java
	src/config/struts-user.xml
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/newWorkerSalary_daiqixin.jsp
	build/classes/.gitignore
	build/classes/com/sms/action/EmployeeAction.class
	build/classes/com/sms/action/NewEmployeeAction.class
	build/classes/com/sms/action/SalaryAction.class
	build/classes/com/sms/action/UserAction.class
	build/classes/com/sms/entity/Employee.class
	build/classes/com/sms/entity/ExperienceInfo.class
	build/classes/com/sms/other/ComputeSalarySingleton.class
	build/classes/com/sms/security/Md5.class
	build/classes/com/sms/service/LevelSalaryChange.class
	build/classes/config/struts-user.xml
	src/config/struts-user.xml
	modified:   WebContent/Employee.jsp
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	WebContent/left.jsp
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	src/com/sms/action/EmployeeAction.java
	deleted:    src/com/sms/action/BonusAction.java
Merge branch 'master' of github.com:SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/js/employee.js
	WebContent/newWorkerSalary_daiqixin.jsp
	build/classes/config/struts-user.xml
	src/config/struts-user.xml