Merge branch 'master' into chende
Merge branch 'master' into chende
修改设备加载页面超时