maven模块化配置
Merge remote-tracking branch 'remotes/origin/remote'

Conflicts:
	src/main/java/com/ht/scada/oildata/service/WellService.java
merge
Merge branch 'master' of https://github.com/bcw104/scada-oildata

Conflicts:
	pom.xml