代码优化

17ae2018 · mengcuiguang · b653f483 · 17ae2018
Commit 17ae2018 authored May 13, 2021 by mengcuiguang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

LoanService.java ...pp/src/main/java/com/mints/goodmoney/net/LoanService.java +0 -3

No files found.
--- a/GoodMoney/app/src/main/java/com/mints/goodmoney/net/LoanService.java
+++ b/GoodMoney/app/src/main/java/com/mints/goodmoney/net/LoanService.java
@@ -629,8 +629,6 @@ public interface LoanService {
    @POST("api/setWechatTipsStatus")
    Observable<BaseResponse<JsonObject>> setWechatTipsStatus(@Body Map<String, Object> vo);

-<<<<<<< HEAD
-=======
    /**
     * 获取权重信息
     *
@@ -639,7 +637,6 @@ public interface LoanService {
    @POST("api/vedioPlans")
    Observable<BaseResponse<UserTaskMsgBean>> vedioPlans();

->>>>>>> cb2ffa05e5c027ec30d75fc7298c1e0c249a8eb5
    /**
     * 默认http工厂
     */