Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/plan/order/components/returnPre.vue

@@ -18,7 +18,7 @@
           <el-table-column prop="productCode" label="物料编码" />
           <el-table-column prop="productName" label="物料名称" />
           <el-table-column prop="productModel" label="规格" />
-          <el-table-column prop="supplyNum" label="数量" />
+          <el-table-column prop="actualNum" label="数量" />
           <el-table-column prop="batchNo" label="批号" />
           <el-table-column prop="bomRemark" label="BOM备注" />
         </el-table>