Browse Source

锁具机构物资数据调整

pm 2 months ago
parent
commit
5e738a6434
1 changed files with 0 additions and 4 deletions
  1. 0 4
      src/views/hw/hardware/lockset/LocksetForm.vue

+ 0 - 4
src/views/hw/hardware/lockset/LocksetForm.vue

@@ -213,11 +213,7 @@ const getLockTypeList = async () => {
 const getMaterialList = async () => {
   const data = { pageNo: 1, pageSize: -1 }
   const response = await MaterialApi.listMaterials(data)
-<<<<<<< HEAD
-
-=======
   console.log(response,'数据是什么')
->>>>>>> 44f8079758c8a632e239da8fd6422e3f2e6be805
   materialsOptions.value = response.list.map(item => ({
     value: item.id,
     label: item.materialsName