From a0dc6be52293a64ebfe38b8c2391dc7d2ffe63ae Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 15 五月 2023 20:05:27 +0800
Subject: [PATCH] 提交代码

---
 app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
index 88fb3d8..e57fe1d 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
@@ -2,10 +2,17 @@
 
 import com.android.app_base.http.ResultData;
 import com.application.zhangshi_app_android.bean.CaptchaImageBean;
+import com.application.zhangshi_app_android.bean.ContactsDetailBean;
+import com.application.zhangshi_app_android.bean.ContactsResponseBean;
 import com.application.zhangshi_app_android.bean.FamilyAssetsResponseBean;
 import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
-import com.application.zhangshi_app_android.bean.FamilyMemorabiliaRequestBean;
 import com.application.zhangshi_app_android.bean.FamilyMemorabiliaResponseBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAutobiographyBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
 import com.application.zhangshi_app_android.bean.HomeDevicesResponseBean;
 import com.application.zhangshi_app_android.bean.HonorCollectionResponseBean;
 import com.application.zhangshi_app_android.bean.IncomeAndExpensesResponseBean;
@@ -14,7 +21,6 @@
 import com.application.zhangshi_app_android.bean.LoginResponseBean;
 import com.application.zhangshi_app_android.bean.UploadFileResponseBean;
 
-import java.io.File;
 import java.util.List;
 import java.util.Map;
 
@@ -28,7 +34,6 @@
 import retrofit2.http.PUT;
 import retrofit2.http.Part;
 import retrofit2.http.Path;
-import retrofit2.http.Query;
 import retrofit2.http.QueryMap;
 
 /**
@@ -96,6 +101,7 @@
     Observable<ResultData<HomeDevicesResponseBean>> getHomeDevices(@QueryMap Map<String, Object> paramsMap);
 
     /**
+<<<<<<< HEAD
      * 鑾峰彇瀹跺涵鑽ｈ獕
      */
     @GET("/zfCollection/all")
@@ -112,4 +118,45 @@
      */
     @GET("/zfEconomy/all")
     Observable<ResultData<IncomeAndExpensesResponseBean>> getIncomeAndExpenses(@QueryMap Map<String, Object> map);
+
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻涓汉淇℃伅
+     */
+    @GET("/self/user")
+    Observable<ResultData<GrowthExperienceInformationBean>> getGrowthExperienceInformation();
+
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻锛堜富瑕佸涔犲強宸ヤ綔缁忓巻锛�
+     */
+    @GET("/zExperience/all")
+    Observable<ResultData<List<GrowthExperienceBean>>> getGrowthExperience();
+
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻锛堝搴垚鍛樺強涓昏绀句細鍏崇郴鎯呭喌锛�
+     */
+    @GET("/self/user/relation")
+    Observable<ResultData<List<GrowthExperienceRelationshipBean>>> getGrowthExperienceRelationship();
+
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻锛堟寔鏈夊嚭鍏ュ璇佷欢鎯呭喌锛�
+     */
+    @GET("/zCertificate/all")
+    Observable<ResultData<List<GrowthExperienceHolderConditionBean>>> getGrowthExperienceHolderCondition();
+
+    /**
+     * 鑾峰彇鎴愰暱缁忓巻锛堝嚭鍥藉鎯呭喌锛�
+     */
+    @GET("/zAbroad/all")
+    Observable<ResultData<List<GrowthExperienceAbroadConditionBean>>> getGrowthExperienceAbroadCondition();
+    /**
+     * 鑾峰彇鑷紶
+     */
+    @GET("/zAutobiography/all")
+    Observable<ResultData<List<GrowthExperienceAutobiographyBean>>> getGrowthExperienceAutobiography();
+
+    /**
+     * 鑾峰彇閫氳褰�
+     */
+    @GET("/zfContact/all")
+    Observable<ResultData<ContactsResponseBean>> getContacts(@QueryMap Map<String, Object> paramsMap);
 }

--
Gitblit v1.9.1