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

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

diff --git a/src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue b/src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue
similarity index 98%
rename from src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue
rename to src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue
index 412c57b..cf46a25 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue
+++ b/src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue
@@ -97,7 +97,7 @@
 
 <script lang="ts">
 import { reactive, toRefs, ref, nextTick, onMounted } from 'vue';
-import approveItemDialog from '/@/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue';
+import approveItemDialog from '/@/views/specialWorkSystem/flow/ruleofApp/components/approveItemDialog.vue';
 import { ElMessage } from 'element-plus/es';
 import { safetyActionApi } from '/@/api/specialWorkSystem/safetyAction';
 import { approveBasicApi } from '/@/api/specialWorkSystem/approveBasic';

--
Gitblit v1.9.2