From 13c546813264c554d6c9f2c5b2e741b6201ab6d2 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Mon, 29 Jan 2024 13:21:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AC=E5=9C=B0=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/tbserverinfo.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/api/model/tbserverinfo.js b/src/api/model/tbserverinfo.js
index a321c04..30a6b85 100644
--- a/src/api/model/tbserverinfo.js
+++ b/src/api/model/tbserverinfo.js
@@ -52,7 +52,6 @@ export function exportTbserverinfo(query) {
   })
 }
 
-<<<<<<< Updated upstream
 // 查询TB服务信息
 export function queryTbserverinfoList() {
   return request({
@@ -60,8 +59,6 @@ export function queryTbserverinfoList() {
     method: 'get'
   })
 }
-=======
->>>>>>> Stashed changes
 
 // 查询TB服务信息列表
 export function listserverinfoNoPage(query) {