自娱自乐
存着玩
工资数据库的更改
Merge branch 'master' of https://github.com/SYSU-Jmiao/SYSUSalaryManagementSystem

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	build/classes/.gitignore
	build/classes/com/sms/action/LoginAction.class
	build/classes/com/sms/action/UserAction.class
	build/classes/com/sms/dao/impl/UserDaoImp.class
	build/classes/com/sms/entity/User.class
	build/classes/com/sms/service/impl/UserManageImp.class
	build/classes/config/applicationContext-beans.xml
	build/classes/config/applicationContext-common.xml
	build/classes/config/struts-user.xml
	src/com/sms/action/LoginAction.java
	src/com/sms/action/UserAction.java
	src/com/sms/entity/ManagePositionSalary.java
	src/com/sms/entity/ManageSalaryChange.java
	src/com/sms/entity/ProfessionalPositionSalary.java
	src/com/sms/entity/WorkerPositionSalary.java
	src/com/sms/interceptor/CheckLogin.java
	src/config/applicationContext-beans.xml
	src/config/applicationContext-common.xml
	src/config/struts-user.xml