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

spring

4 天以前 a9600ae56b844289a04e1a7385cf0ccfc384cd08

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -89,6 +89,7 @@
  {
    label: "申请部门",
    prop: "approveDeptName",
      width: 220
  },
  {
    label: "审批事由",
@@ -97,7 +98,7 @@
  },
  {
    label: "申请人",
    prop: "approveUser",
    prop: "approveUserName",
  },
  {
    label: "申请日期",
@@ -110,7 +111,7 @@
  },
  {
    label: "当前审批人",
    prop: "checkCompany",
    prop: "approveUserCurrentName",
    width: 120
  },
  {