Merge branch 'develop/iscs' of http://192.168.0.253:3000/bozzysadmb/ISCS_Standard_front into develop/iscs

# Conflicts:
#	src/views/hw/hardware/lockset/LocksetForm.vue

src/views/hw/hardware/lockset/LocksetForm.vue

@@ -213,9 +213,13 @@ 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.materialsCabinetId,
+    value: item.id,
     label: item.materialsName
   }))
 }