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

Conflicts:
	resources/application.properties
	scada-config.product