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/process/gasCheck/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/specialWorkSystem/workProcess/gasCheck/index.vue b/src/views/specialWorkSystem/process/gasCheck/index.vue
similarity index 99%
rename from src/views/specialWorkSystem/workProcess/gasCheck/index.vue
rename to src/views/specialWorkSystem/process/gasCheck/index.vue
index a724e75..6ef38e0 100644
--- a/src/views/specialWorkSystem/workProcess/gasCheck/index.vue
+++ b/src/views/specialWorkSystem/process/gasCheck/index.vue
@@ -209,7 +209,7 @@
export default {
name: 'gasCheck',
components: {
- permitNo: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workProcess/components/dialogPermitNo.vue'))
+ permitNo: defineAsyncComponent(() => import('/@/views/specialWorkSystem/process/components/dialogPermitNo.vue'))
},
setup() {
const userInfo = useUserInfo();
--
Gitblit v1.9.2