From e622bd5e3b2638b9ab9a712ed1160a66018d6fd7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 22 二月 2024 09:21:15 +0800
Subject: [PATCH] mrshi
---
platform/src/layouts/AppLayout.vue | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/platform/src/layouts/AppLayout.vue b/platform/src/layouts/AppLayout.vue
index f073fc6..96464f1 100644
--- a/platform/src/layouts/AppLayout.vue
+++ b/platform/src/layouts/AppLayout.vue
@@ -13,9 +13,15 @@
<div style="height:10px;"></div>
<main>
<transition name="fade">
+<<<<<<< HEAD
<!-- <keep-alive>-->
<router-view></router-view>
<!-- </keep-alive>-->
+=======
+ <keep-alive>
+ <router-view></router-view>
+ </keep-alive>
+>>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
</transition>
</main>
</el-main>
--
Gitblit v1.9.3