合并代码，解决冲突
Merge branch 'master' of https://github.com/bcw104/scada-tag

Conflicts:
	src/main/java/com/ht/scada/common/tag/util/EndTagTypeEnum.java
Merge branch 'master' of https://github.com/bcw104/scada-tag
Merge branch 'master' of https://github.com/bcw104/scada-tag
移除EndTagTypeEnum