重构java包
添加缺少的两个类
Merge https://github.com/bcw104/scada-oildata

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