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

yaowanxin

昨天 e3847238a8ee1cf2e013a85d98b4b48fd5f4c3ec

 src/views/inventoryManagement/stockManagement/Qualified.vue

@@ -135,7 +135,7 @@
    type: 'warning',
  }
  ).then(() => {
    proxy.download("/stockin/exportCopy", {}, '库存信息.xlsx')
    proxy.download("/stockInventory/exportStockInventory", {}, '库存信息.xlsx')
  }).catch(() => {
    proxy.$modal.msg("已取消")
  })