From 1b555a0ab0527478cdf2b0c31c0ea8aea70f8adc Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 15 六月 2023 10:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into yxh01

---
 src/components/iFrame/index.vue |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ruoyi-ui/src/components/iFrame/index.vue b/src/components/iFrame/index.vue
similarity index 95%
rename from ruoyi-ui/src/components/iFrame/index.vue
rename to src/components/iFrame/index.vue
index 426857f..24a8ed5 100644
--- a/ruoyi-ui/src/components/iFrame/index.vue
+++ b/src/components/iFrame/index.vue
@@ -1,3 +1,4 @@
+<!-- 椤甸潰鍐呭祵鍏ュ皝瑁� -->
 <template>
   <div v-loading="loading" :style="'height:' + height">
     <iframe

--
Gitblit v1.9.3