暂时修改了 合并代码
Merge branch 'master' of https://github.com/zhaoleidlut/scada-config

Conflicts:
	bin/application.properties
	resources/application.properties