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

guoyuji

2024-04-19 5314634fbbe6fd099d9b134614dba450cba2b5b9

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue

@@ -734,9 +734,9 @@
            </el-select>
        </el-row>
      </div>
      <div class="main-div-customers">
      <div class="main-div-customers" style="height: 350px">
        <vxe-grid
            height="400px"
            height="100%"
            class="mytable-scrollbar"
            ref="xGrids"
            v-bind="gridOption"