合并代码
Merge branch 'master' of https://github.com/zhaoleidlut/scada-config
Merge branch 'master' of https://github.com/zhaoleidlut/scada-config
增加两个jar包
改正子类型名与枚举不匹配的错误
合并代码
Merge branch 'master' of https://github.com/zhaoleidlut/scada-config

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