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

gaoluyang

昨天 eb6f3d149c6279877cf806575901bb482d7f2b64

 src/views/personnelManagement/contractManagement/index.vue

@@ -266,7 +266,7 @@
    type: "warning",
  })
    .then(() => {
      proxy.download("/staff/staffOnJob/export", {}, "合同管理.xlsx");
      proxy.download("/staff/staffOnJob/export", {staffState: 1}, "合同管理.xlsx");
    })
    .catch(() => {
      proxy.$modal.msg("已取消");