From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java
index a63955e..0a10a3a 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java
@@ -7,20 +7,5 @@
* @desc 鑾峰彇鎴愰暱缁忓巻鐨勮繑鍥炵被
*/
public class GrowthExperienceResponseBean {
- private List<GrowthExerienceResponseBean> data;
- private long pageNum;
- private long pageSize;
- private long total;
- public List<FamilyMemorabiliaBean> getData() { return data; }
- public void setData(List<FamilyMemorabiliaBean> value) { this.data = value; }
-
- public long getPageNum() { return pageNum; }
- public void setPageNum(long value) { this.pageNum = value; }
-
- public long getPageSize() { return pageSize; }
- public void setPageSize(long value) { this.pageSize = value; }
-
- public long getTotal() { return total; }
- public void setTotal(long value) { this.total = value; }
}
--
Gitblit v1.9.1