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();