22
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/Employee.jsp
	WebContent/newWorkerSalary_daiqixin.jsp
	build/classes/config/struts-user.xml
	src/config/struts-user.xml
11
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	WebContent/left.jsp
	WebContent/newWorkerSalary_daiqixin.jsp