addsomthin
Merge branch 'master' of https://github.com/BlueDots/sms
add
add something
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/po/HosInsuranceInfo.class
	sms/WebRoot/WEB-INF/classes/mybatis.xml
	sms/src/jxau/sms/anping/po/DepInfo.java
	sms/src/mybatis.xml
aaa
add