整理规范化后的spring配置
Merge branch 'master' of https://github.com/bcw104/scada-common

Conflicts:
	src/main/java/com/ht/scada/common/tag/util/VarSubType.java