Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue

@@ -221,7 +221,7 @@
                     </template>
                   </el-table-column>
 
-                  <el-table-column prop="matRest" label="库存数量" min-width="120" align="center" />
+                  <el-table-column prop="stockQuantity" label="库存数量" min-width="120" align="center" />
                   <el-table-column prop="storageOkQty" min-width="120" align="center">
                     <template #header> <span class="hl-table_header">*</span>本次出库数量</template>
                     <template #default="scope">