.....
增加advInfoservice
增加评优评先Service
Merge branch 'master' of https://github.com/BlueDots/sms

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/ca/7b/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/ca/a8/26/2/59/8b/76/92/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/ca/a8/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/org.eclipse.wst.jsdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/13.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.dltk.core/2104960690.index
	.metadata/.plugins/org.eclipse.dltk.core/cache/index
	.metadata/.plugins/org.eclipse.jdt.core/4017589347.index
	.metadata/.plugins/org.eclipse.jdt.core/participantsIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jst.jsp.core/jspsearch/217224304.index
	.metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/4017589347.dat
	.metadata/.plugins/org.eclipse.jst.jsp.core/translators/4224401690.translator
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/4017589347.index
	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.validation/dep.index
	.metadata/.plugins/org.eclipse.wst.xml.core/system_catalog.xml
	sms/.classpath
测试
Merge branch 'master' of https://github.com/BlueDots/sms

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/af/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/ca/7b/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/ca/a8/26/2/59/8b/76/92/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/ca/a8/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/e4/2/59/8b/76/92/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/e4/2/59/8b/76/b5/20/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/e4/2/59/92/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/e4/2/59/f/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/sms/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/15.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.dltk.core/2104960690.index
	.metadata/.plugins/org.eclipse.dltk.core/2533196561.index
	.metadata/.plugins/org.eclipse.dltk.core/cache/index
	.metadata/.plugins/org.eclipse.dltk.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/4017589347.index
	.metadata/.plugins/org.eclipse.jdt.core/participantsIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jst.jsp.core/jspsearch/217224304.index
	.metadata/.plugins/org.eclipse.jst.jsp.core/jspsearch/2577881113.index
	.metadata/.plugins/org.eclipse.jst.jsp.core/translators/257758352.translator
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	.metadata/.plugins/org.eclipse.wst.internet.cache/cache.xml
	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/4017589347.index
	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.jsdt.web.core/jssearch/2577881113.index
	.metadata/.plugins/org.eclipse.wst.validation/dep.index
	sms/WebRoot/WEB-INF/classes/jxau/sms/globaldao/EntityDao.class
	sms/bin/jxau/sms/lyx/role/dao/roleMapper.xml