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

---
 src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue b/src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue
similarity index 99%
rename from src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue
rename to src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue
index 8a15ba4..7880a01 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue
+++ b/src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue
@@ -110,7 +110,7 @@
 import { ElMessage } from 'element-plus/es';
 import { approveRuleApi } from '/@/api/specialWorkSystem/approveRule';
 import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
-import approveLevelDialog from '/@/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue';
+import approveLevelDialog from '/@/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue';
 interface dataState {
     title: string;
     pointTitle: string;

--
Gitblit v1.9.2