feat: 合并冲突

src/views/task/content/Content.vue

@@ -5,6 +5,7 @@ import { getTaskDetailInfo, getTaskDetailPictureList } from '@/api/work/work'
 import { useTask } from '@/store/modules/task'
 import { useUser } from '@/store/modules/user'
 import { isEmpty } from '@/utils'
+import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
 import emitter from '@/utils/mitt'
 import _ from 'lodash'
@@ -16,16 +17,7 @@ import ConfrimModal from '../modal/ConfrimModal.vue'
 import CustomSettingModal from '../modal/CustomSettingModal.vue'
 import PictureTable from './PictureTable.vue'
 import TaskTable from './TaskTable.vue'
-import { getAllfieldList } from '@/api/home/filter'
-import { audit } from '@/api/task/task'
-import { getTaskDetailInfo, getTaskDetailPictureList } from '@/api/work/work'
-import { useTask } from '@/store/modules/task'
-import { useUser } from '@/store/modules/user'
-import { isEmpty } from '@/utils'
-import { hideDownload } from '@/utils/image'
-import emitter from '@/utils/mitt'
 import type { ApprovalParam, PictureSortParam } from '/#/api'
-import { formatToDateHMS } from '@/utils/dateUtil'
 
 
 const batch = ref(false)