修改完应急物资bug

src/api/emergency-drill/emergency-drill.ts

@@ -6,13 +6,9 @@ import {
   CreateEmergencyDrillRuleForm,
   DrillPlanItemDetail,
   DrillPlanRecord,
-<<<<<<< HEAD
   ExecuteDrillPlanRuleForm,
 } from '@/views/emergency/emergency-drill/types';
-=======
-} from '@/views/emergency/emergency-drill/types';
 import type { DrillSignlistQuery, DrillSignListResponse } from '@/types/emergency-drill';
->>>>>>> 25dea31a (feat: 添加应急演练页面)
 
 export const queryEnergencyDrillPlanList = (params: QueryPageRequest<DrillPlanListSearch>) => {
   return http.request<QueryPageResponse<DrillPlanItem>>({
@@ -40,7 +36,6 @@ export const createEmergencyDrillPlan = (params: CreateEmergencyDrillRuleForm) =
   });
 };
 
-<<<<<<< HEAD
 export const saveEmergencyDrillExecute = (params: ExecuteDrillPlanRuleForm) => {
   return http.request({
     url: '/emergencyDrill/saveEmergencyDrillPlan',
@@ -56,8 +51,6 @@ export const saveEmergencyDrillExecute = (params: ExecuteDrillPlanRuleForm) => {
   });
 };
 
-=======
->>>>>>> 25dea31a (feat: 添加应急演练页面)
 export const deleteEmergencyDrillPlan = (id) => {
   return http.request({
     url: `/emergencyDrill/deleteEmergencyDrillPlan?drillPlanId=${id}`,
@@ -86,13 +79,13 @@ export const exportEmergencyDrillRecord = (id) => {
   });
 };
 
-<<<<<<< HEAD
 // 查询应急预案名
 export const queryEmergencyPlanDetail = (id) => {
   return http.request<any>({
     url: `/emergencyPlan/queryEmergencyPlanDetail?emergencyPlanId=${id}`,
     method: 'get',
-=======
+  })
+}
 /**
  * 查询演练会签列表
  */
@@ -101,6 +94,5 @@ export const getDrillSignList = (data: QueryPageRequest<DrillSignlistQuery>) =>
     url: '/emergencyDrill/queryEmergencyDrillSignListPage',
     method: 'post',
     data,
->>>>>>> 25dea31a (feat: 添加应急演练页面)
   });
 };