删除合并冲突后多余的挂锁类型

src/views/mes/hw/padLocks/index.vue

@@ -99,17 +99,8 @@
         :show-overflow-tooltip="true"
       />
 
-
-      <el-table-column
-        label="所属硬件"
-        align="center"
-        prop="hardwareName"
-      />
-      <el-table-column
-        label="挂锁类型"
-        align="center"
-        prop="lockTypeName"
-      />
+      <el-table-column label="所属硬件" align="center" prop="hardwareName" />
+      <el-table-column label="挂锁类型" align="center" prop="lockTypeName" />
       <el-table-column
         label="创建时间"
         align="center"
@@ -212,13 +203,6 @@
         <el-form-item label="挂锁NFC" prop="lockNfc">
           <el-input v-model="form.lockNfc" placeholder="请输入挂锁Nfc" />
         </el-form-item>
-
-        <el-form-item label="挂锁类型" prop="lockTypeId">
-          <el-input
-            v-model="form.lockTypeId"
-            placeholder="请输入挂锁类型"
-          />
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>