Merge remote-tracking branch 'origin/master'

sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue

@@ -248,6 +248,8 @@ export default {
         obj.deviceMac = `%${this.searchVal}%`;
       } else if (this.type == 3) {
         obj.ip = `%${this.searchVal}%`;
+      } else if (this.type == 4) {
+        obj.belong = `%${this.searchVal}%`;
       }
 
       let res = await getDeviceList(obj);

sample-form-manager-ui/admin/src/pages/hardware/modal/AddDevice.vue

@@ -136,9 +136,9 @@
               ></el-input-number> </el-form-item
           ></el-col>
           <el-col :span="12"
-            ><el-form-item label="所属机构" prop="institution">
+            ><el-form-item label="所属机构" prop="belong">
               <el-input
-                v-model="form.institution"
+                v-model="form.belong"
                 placeholder="请输入所属机构"
               ></el-input> </el-form-item
           ></el-col>