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

maven

2 天以前 7f9b99a28cd983fa55b5788519682e4794cf6cb0

 src/views/inventoryManagement/stockManagement/index.vue

@@ -232,7 +232,7 @@
    // tableData.value.map(item => {
    //   item.children = []
    // })
    // total.value = res.total
    total.value = res.data.total
  }).catch(() => {
    tableLoading.value = false
  })