From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突

---
 src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
index 7a4e8cd..69ec3e8 100644
--- a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
+++ b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
@@ -95,7 +95,7 @@
 import { Plus, Search, Delete, Edit, Download, Refresh, View, EditPen } from '@element-plus/icons-vue';
 // import OpenSee from '/@/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue';
 // import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
-// import EmergencySupplies from '/@/components/emergencySupplies/index.vue';
+// import EmergencySupplies from '/@/components/emergencySupplies/spi.vue';
 // import OpenAdd from '/@/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue';
 // import { contingencyApi } from '/@/api/contingency';
 // import { emergencySuppliesMaintainApi } from '/@/api/emergencySuppliesMaintain';

--
Gitblit v1.9.2