Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-16 329e41ccb0cd24d102b8d5c6db5c167ca01da857

 north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue

@@ -87,7 +87,9 @@
  let materialStore={
    id:ruleForm.value.id,
    type:value.value,
    json:productName
    json:productName,
    width:BasicData.value[0].Type,
    height:BasicData.value[1].Type
  }
  console.log(materialStore)
  if(isBool){