From a2cec60f1d71066cec64972bd288e4deede55581 Mon Sep 17 00:00:00 2001
From: Forget <1771761586@qq.com>
Date: Thu, 11 Mar 2021 23:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/power/doc/builder/TornaBuilder.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/power/doc/builder/TornaBuilder.java b/src/main/java/com/power/doc/builder/TornaBuilder.java
index d9ecbeb..ad41938 100644
--- a/src/main/java/com/power/doc/builder/TornaBuilder.java
+++ b/src/main/java/com/power/doc/builder/TornaBuilder.java
@@ -109,13 +109,9 @@ public class TornaBuilder {
 
     /**
      * push api
-     *
-     * @param responseMsg 标签信息
-     * @param a           接口列表
-<<<<<<< HEAD
-     * @param config      ApiConfig
-=======
->>>>>>> 381efa9 (修改torna对接问题 在ApiTest中添加torna相关配置)
+     * @param responseMsg returnmsg
+     * @param a apiDoc
+     * @param config config
      */
     public static void pushApi(String responseMsg, ApiDoc a, ApiConfig config) {
         JsonElement element = JsonParser.parseString(responseMsg);