1.修改spring配置文件
Merge branch 'master' of github.com:monkeychen/simiam

Conflicts:
	ruijie-snc-performance/src/main/resources/spring/applicationContext-database.xml
	ruijie-snc-performance/src/main/resources/spring/applicationContext.xml