From 0615f6c8dddf1cff5368e85ce4bfa92c4deebe02 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 18:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/systemSetting/device/grid/components/main/index.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/systemSetting/device/grid/components/main/index.vue b/src/views/systemSetting/device/grid/components/main/index.vue
index 48545d9..aae572d 100644
--- a/src/views/systemSetting/device/grid/components/main/index.vue
+++ b/src/views/systemSetting/device/grid/components/main/index.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="mainContent">
-      <div class="aside">
+      <!-- <div class="aside">
         <department-aside />
-      </div>
+      </div> -->
       <div class="grid-content">
         <!-- 鏁版嵁灞曠ず -->
         <el-table ref="multipleTable"

--
Gitblit v1.8.0