测试4
zjc
Merge branch 'master' of https://github.com/gdmc-louis/GraduateWork.git

Conflicts:
	README.md
	WebRoot/WEB-INF/classes/applicationContext.xml
	WebRoot/WEB-INF/classes/dao/Zjc.class
	WebRoot/WEB-INF/classes/hibernate.cfg.xml
	WebRoot/WEB-INF/classes/lhb.xml
	WebRoot/WEB-INF/classes/ozq.xml
	WebRoot/WEB-INF/classes/struts_lhb.xml
	WebRoot/WEB-INF/classes/struts_ozq.xml
	WebRoot/WEB-INF/classes/zjc.xml