aaa
陈江2014-4-12 15:46
cj
cj
cj
Merge branch 'master' of https://github.com/BlueDots/sms

Conflicts:
	sms/WebRoot/WEB-INF/classes/jxau/sms/anping/po/DepInfo.class
	sms/WebRoot/WEB-INF/classes/jxau/sms/anping/student/service/impl/UsererviceImpl.class
	sms/WebRoot/WEB-INF/classes/jxau/sms/globaldao/Dao.class
	sms/WebRoot/WEB-INF/classes/jxau/sms/globaldao/EntityDao.class
	sms/WebRoot/WEB-INF/classes/log4j.properties
	sms/src/jxau/sms/anping/po/DepInfo.java
	sms/src/log4j.properties