Merge branch 'dev' into sit

src/views/reportQuery/purchaseReport/components/columns.js

@@ -56,7 +56,7 @@ const table2 = [
     minWidth: "155px",
   },
   {
-    prop: "good_num",
+    prop: "total_num",
     label: "数量",
     minWidth: "155px",
   },
@@ -66,7 +66,7 @@ const table2 = [
     minWidth: "155px",
   },
   {
-    prop: "wait_good_num",
+    prop: "wait_total_num",
     label: "待处理采购单数",
     minWidth: "155px",
   },