将.classpath和.project加入忽略列表
修改为左键点击触发视图
application.properties文件修改
Merge branch 'master' of https://github.com/zhaoleidlut/scada-config

Conflicts:
	bin/com/ht/scada/common/tag/service/TagService.class
	bin/com/ht/scada/common/tag/service/impl/TagServiceImpl.class