首页功能
Merge remote-tracking branch 'origin/master'

Conflicts:
	realtimeMonitor/realtimeMonitor-business/realtimeMonitor-business-monitor/src/main/java/org/whut/monitor/business/monitor/mapper/SensorMapper.java
	realtimeMonitor/realtimeMonitor-business/realtimeMonitor-business-monitor/src/main/java/org/whut/monitor/business/monitor/service/SensorService.java
	realtimeMonitor/realtimeMonitor-business/realtimeMonitor-business-monitor/src/main/java/org/whut/monitor/business/monitor/web/SensorServiceWeb.java
	realtimeMonitor/realtimeMonitor-business/realtimeMonitor-business-monitor/src/main/resources/org/whut/monitor/business/monitor/mapper/SensorMapper.xml
	realtimeMonitor/realtimeMonitorWeb/src/main/webapp/js/config.js