Janz_v23

完成员工添加功能
Janz_debug

Conflicts:
	ApplicationSystem/WebRoot/WEB-INF/classes/com/bean/ResearchInfo.class
	ApplicationSystem/WebRoot/WEB-INF/classes/com/bean/ResearchSalary.class
	ApplicationSystem/WebRoot/WEB-INF/classes/com/text/Janz_test.class
	ApplicationSystem/src/com/bean/ResearchSalary.java