Merge branch 'master' into dev-v1.1

wupengfei

11 小时以前 7cf04da7eaba7cad9c3b5e5f674d2e038ebcd305

 packages/components/src/Card/TaskCheckFileCard.vue

@@ -2,7 +2,7 @@
  <div class="taskCheckFileCard-wrapper">
    <div class="taskCheckFileCard-status-wrapper">
      <div class="taskCheckFileCard-time">
        {{ dayjs(props.createdTime).format('YYYY-MM-DD HH:mm:ss') }}
        {{ props.createdTime ? dayjs(props.createdTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
      </div>
      <div
        class="taskCheckFileCard-status"
@@ -10,7 +10,7 @@
          color: Colors.Warning,
        }"
      >
        {{ EnumTaskCheckReceiveStatusText[props.checkReceiveStatus] }}
        {{ EnumTaskUserSubmitCheckReceiveStatusText[props.checkReceiveStatus] }}
      </div>
    </div>

@@ -44,7 +44,7 @@
import {
  Colors,
  EnumTaskUserSubmitCheckReceiveStatus,
  EnumTaskCheckReceiveStatusText,
  EnumTaskUserSubmitCheckReceiveStatusText,
} from '@12333/constants';
import { setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';