修改spring配置文件
代码合并
Merge branch 'master' of https://github.com/zhaoleidlut/scada-config

Conflicts:
	test-output/Default suite/Default test.html
	test-output/Default suite/Default test.xml
	test-output/emailable-report.html
	test-output/index.html
	test-output/old/Default suite/classes.html
	test-output/old/Default suite/methods-alphabetical.html
	test-output/old/Default suite/methods.html
	test-output/old/Default suite/testng.xml.html
	test-output/testng-results.xml