Merge branch 'master' into jinan-xcx

pages_manage/workbench/laboratory/monitor.vue

@@ -309,7 +309,7 @@ export default {
               tid:"",
               vol:self.trumpetList[i].deviceVol,
               urls:[]
-              
+
             }
           };
           newList.push(obj);