删除一些多余的jar包，取消data和oildata的依赖
Merge branch 'master' of https://github.com/zhaoleidlut/scada-config

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