解决冲突
Merge branch 'master' of https://github.com/bcw104/scada-oildata

Conflicts:
	.settings/org.eclipse.core.resources.prefs