基本无修改
解决冲突
Merge branch 'master' of https://github.com/zhaoleidlut/scada-config

Conflicts:
	META-INF/MANIFEST.MF