From f2e0248fc65aec2b618b0b684ee85aab8a075aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sun, 11 Aug 2024 21:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index cc2ac5b..5454bc1 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -25,11 +25,8 @@ import gzDict from './gzaiBox/dict'
 import plan from './plan/index'
 import periodical from './periodical/index'
 import engin from './engin'
-<<<<<<< .mine
 import tower from './device/tower/index'
-=======
 import quality from './quality'
->>>>>>> .theirs
 import {axios,download} from '@/utils/request'
 export default {
     project,
@@ -60,11 +57,7 @@ export default {
     downFile:download,
     engin,
     gzAiBoxVideo,
-<<<<<<< .mine
-    gzDict,
-    tower
-=======
     gzDict,
+    tower,
     quality
->>>>>>> .theirs
 }
\ No newline at end of file