From a2311676aa3aa41097a14a6eeef016a7061a7bed Mon Sep 17 00:00:00 2001
From: bai <173792339@qq.com>
Date: Mon, 9 Sep 2024 00:03:36 +0800
Subject: [PATCH] =?UTF-8?q?2=E7=BB=84=E9=A2=9C=E5=80=BC=E6=8B=85=E5=BD=93?=
 =?UTF-8?q?=E5=9C=A89=E6=9C=88=E5=85=AB=E6=97=A523.44=E6=8E=A8=E7=9A=84?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/muyu/market/admain/Myapi.java            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cloud-market2-common/src/main/java/com/muyu/market/admain/Myapi.java b/cloud-market2-common/src/main/java/com/muyu/market/admain/Myapi.java
index edb9689..e3cb38b 100644
--- a/cloud-market2-common/src/main/java/com/muyu/market/admain/Myapi.java
+++ b/cloud-market2-common/src/main/java/com/muyu/market/admain/Myapi.java
@@ -107,10 +107,7 @@ public class Myapi extends BaseEntity{
                 .apiName( myapiSaveReq.getApiName())
                 .ip( myapiSaveReq.getIp())
                 .mode( myapiSaveReq.getMode())
-<<<<<<< HEAD
                 .auth( myapiSaveReq.getAuth() )
-=======
->>>>>>> 8c53524 (2组颜值担当在9月八日23.44推的后台)
                 .type( myapiSaveReq.getType())
                 .msgresp(myapiSaveReq.getMsgresp())
                 .build();