From c4acc9cdfc3a3a22bd89661a4af1429e01e2e260 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 20 四月 2021 18:43:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/conf/Topic.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index f9a0dce..9bc0bb5 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -44,7 +44,7 @@
   id: 5,
   checked: false,
   isShow: true,
-  icon: 'iconditu1',
+  icon: 'iconditu',
   comp: ''
 }, {
   name: '鍦熷¥鍙婂湴涓嬫按',
@@ -60,7 +60,7 @@
   isShow: true,
   icon: 'iconguanxianxuncha',
   comp: ''
-}, {
+} /* {
   name: '绠¢亾鍙樻洿',
   id: 8,
   checked: false,
@@ -74,4 +74,4 @@
   isShow: true,
   icon: 'iconguanxianbiaozhu',
   comp: ''
-}]
+} */]

--
Gitblit v1.8.0