From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +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 8e77a2a..7f566af 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -47,14 +47,14 @@
   isShow: false,
   icon: 'iconditu',
   comp: ''
-}, {
+}, /* {
   name: '鍦熷￥鍙婂湴涓嬫按',
   id: 6,
   checked: false,
   isShow: false,
   icon: 'icondxs_green',
   comp: ''
-}, {
+} */ {
   name: '绠＄嚎',
   id: 7,
   checked: false,
@@ -68,7 +68,7 @@
   isShow: false,
   icon: 'iconqiye',
   comp: ''
-}/* {
+} /* {
   name: '绠￠亾鍙樻洿',
   id: 8,
   checked: false,

--
Gitblit v1.8.0