json接口由jacson改为fastjson
Merge branch 'master' of https://github.com/bcw104/scada-oildata

Conflicts:
	pom.xml