完善实况页设备详情功能
Merge remote-tracking branch 'origin/master'

Conflicts:
	rentManagement/rentManagementWeb/src/main/webapp/js/config.js
Merge branch 'master' of https://github.com/xiaozhujun/platform
优化dashboard界面展示效果