From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict

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

diff --git a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
index b73c265..fee9bf1 100644
--- a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
+++ b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
@@ -93,10 +93,10 @@
 	// FormInstance,
 } from 'element-plus';
 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 OpenSee from '/@/views/contingencyManagement/emergencyPlanStartRecord/components/openSee.vue';
+// import UpData from '/@/views/contingencyManagement/panManagement/components/upData.vue';
 // import EmergencySupplies from '/@/components/emergencySupplies/index.vue';
-// import OpenAdd from '/@/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue';
+// import OpenAdd from '/@/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/components/openAdd.vue';
 // import { contingencyApi } from '/@/api/contingency';
 // import { emergencySuppliesMaintainApi } from '/@/api/emergencySuppliesMaintain';
 

--
Gitblit v1.9.2