1.将VarNameType改为VarSubType
2.增加变量模板读操作
3.将油井相关类移至scada-oildata模块
Merge branch 'master' of https://github.com/bcw104/scada-common

Conflicts:
	src/main/java/com/ht/scada/common/tag/service/impl/TagCfgTplServiceImpl.java
修改 AcquisitionDeviceService.java接口错误