add soemthing cheng cheng
Merge branch 'master' of https://github.com/BlueDots/sms

Conflicts:
	sms/WebRoot/WEB-INF/classes/jxau/sms/chenjiang/stuBasicInfo/service/impl/TestService.class
	sms/WebRoot/WEB-INF/classes/jxau/sms/qing/login/service/LoginService.class