修复运行错误
Merge branch 'master' of https://github.com/bcw104/scada-oildata

Conflicts:
	src/main/java/com/ht/scada/common/middleware/service/WellService.java
	src/main/java/com/ht/scada/common/middleware/service/impl/WellDataServiceImpl.java
	src/main/java/com/ht/scada/oildata/service/WellService.java
	src/main/java/com/ht/scada/oildata/service/impl/WellDataServiceImpl.java
	src/main/java/com/ht/scada/oildata/service/service/WellService.java
	src/main/java/com/ht/scada/oildata/service/service/impl/WellDataServiceImpl.java