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 66050d9..e97afdc 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
@@ -64,14 +64,11 @@ public class Myapi extends BaseEntity{
      */
     @Schema(description = "请求方式",type = "String")
     private String mode;
-<<<<<<< HEAD
     /**
      * 购买字段
      */
     @Schema(description = "购买字段（当修改成功触发）",type = "Integer")
     private int auth;
-=======
->>>>>>> 8c53524 (2组颜值担当在9月八日23.44推的后台)
     /*
     API类型
      */
@@ -82,15 +79,11 @@ public class Myapi extends BaseEntity{
      */
     @Schema(description = "API返回报文",type = "String")
     private String msgresp;
-<<<<<<< HEAD
-=======
     /*
     购买触发
      */
     @Schema(description = "购买触发",type = "Integer")
     private Integer buy;
->>>>>>> 8c53524 (2组颜值担当在9月八日23.44推的后台)
-
     private String createBy;
     private Date createTime;
     private String updateBy;
@@ -111,15 +104,9 @@ public class Myapi extends BaseEntity{
                 .type( myapiSaveReq.getType())
                 .msgresp(myapiSaveReq.getMsgresp())
                 .build();
-
-
     }
 
 
-
-
-
-
     public static Myapi UpdMyapiList(MyapiUpdReq myapiUpdReq, Supplier<Long> apiId){
 
         return Myapi
@@ -132,10 +119,7 @@ public class Myapi extends BaseEntity{
                 .apiName( myapiUpdReq.getApiName())
                 .ip( myapiUpdReq.getIp())
                 .mode( myapiUpdReq.getMode())
-<<<<<<< HEAD
                 .auth( myapiUpdReq.getAuth() )
-=======
->>>>>>> 8c53524 (2组颜值担当在9月八日23.44推的后台)
                 .type( myapiUpdReq.getType())
                 .msgresp(myapiUpdReq.getMsgresp())
                 .build();