2组颜值担当在9月八日23.44推的后台

2024-09-09 00:03:36 +08:00 · 2024-09-09 00:03:36 +08:00 · a2311676aa
parent e08d8e7f23
commit a2311676aa
1 changed files with 0 additions and 3 deletions
--- 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();