切换到真实环境
Merge branch 'master' of https://github.com/bcw104/scada-webapp

Conflicts:
	pom.xml
	src/main/java/com/ht/scada/web/entity/AlarmHandle.java
	src/main/resources/application.development.properties
	src/main/webapp/WEB-INF/spring-mvc.xml
Merge branch 'master' of https://github.com/bcw104/scada-webapp
合并