Merge branch 'develop/3.0.8' into test

src/views/device/list/index.vue

@@ -11,7 +11,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="设备分类：">
-        <el-select v-model="form.deviceType" placeholder="请选择设备分类" clearable>
+        <el-select v-model="form.categoryId" placeholder="请选择设备分类" clearable>
           <el-option v-for="item in categoryOptions" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
       </el-form-item>