Merge branch 'master' into dev-v1.1

wupengfei

4 小时以前 b331f884097a2dc5086c8cf043c8c8f52e7640fe

 src/views/EmploymentManage/CheckReceiveTaskDetail.vue

@@ -32,7 +32,7 @@
              </ProFormItemV2>
            </ProFormColItem>
            <ProFormColItem :span="8">
              <ProFormItemV2 label="发布日期:">
              <ProFormItemV2 label="结束日期:">
                {{ dayjs(taskInfo.endTime ?? '').format('YYYY-MM-DD') }}
              </ProFormItemV2>
            </ProFormColItem>
@@ -88,7 +88,7 @@
    },
    extraProps: {
      hide: (row: API.GetCheckReceiveTaskQueryResultItem) =>
        row.checkReceiveStatus !== EnumTaskCheckReceiveStatus.WaitCheckReceive,
        row.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed,
    },
  },
  {