合并

yudao-ui-admin-vue3/src/views/pressure2/pipescheduling/components/PipePlanScheduleEquipDialog.vue

@@ -288,7 +288,7 @@
 import type { PropType } from 'vue'
 import { FormInstance } from 'element-plus'
 import { useMessage } from '@/hooks/web/useMessage'
-import {formatArrayDate, formatDate, formatDate1} from '@/utils/formatTime'
+import {formatArrayDate, formatDate, formatDate1} from '@/utils/pressure2/formatTime'
 import {
   PressurePipeCheckType,
   PressurePipeCheckTypeMap,

yudao-ui-admin-vue3/src/views/pressure2/planNew/components/PlanScheduleEquipBoilerDialog.vue

@@ -369,7 +369,7 @@ import {ElMessageBox, FormInstance} from 'element-plus'
 import { useMessage } from '@/hooks/web/useMessage'
 import CheckerSelect from '@/views/pressure2/equipboilerscheduling/components/CheckerSelect.vue'
 import { PlanSchedulingEquipVO, PlanSchedulingApi } from '@/api/pressure/planScheduling'
-import {formatArrayDate, formatDate, formatDate1} from '@/utils/formatTime'
+import {formatArrayDate, formatDate, formatDate1} from '@/utils/pressure2/formatTime'
 import {
   PressureBoilerCheckType,
   PressureBoilerCheckTypeMap,