lyx01
lyx02
lyx03
Merge branch 'master' of https://github.com/BlueDots/sms

Conflicts:
	sms/WebRoot/WEB-INF/classes/jxau/sms/anping/action/HelloAction.class
	sms/WebRoot/WEB-INF/classes/jxau/sms/anping/student/service/impl/UsererviceImpl.class
	sms/WebRoot/WEB-INF/classes/jxau/sms/chenjiang/activityManage/po/ActInfo.class
	sms/WebRoot/WEB-INF/classes/jxau/sms/li/tecBasicInfo/po/TecBasicInfo.class
	sms/src/jxau/sms/anping/po/DepInfo.java