1.解决版本冲突
解决冲突，修改TagService接口与实现
修改了pom.xml，此文件冲突，将使用仓库中文件
Merge branch 'master' of https://github.com/bcw104/scada-common

Conflicts:
	pom.xml
	src/main/java/com/ht/scada/common/tag/service/TagService.java
	src/main/java/com/ht/scada/common/tag/service/impl/TagServiceImpl.java
删除无用的import