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/GrowthExperienceBean.java | 110 +++++++++++++++++++++++++++---------------------------
1 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java
index 942fdc1..2dd0127 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java
@@ -3,75 +3,75 @@
import java.io.Serializable;
import java.util.List;
- /**
- * @author Gss
- * @date 2023.03.31. 17:47
- * @desc 鎴愰暱缁忓巻 bean 绫�
- */
- public class GrowthExperienceBean implements Serializable {
- private String idName;
- private String usedName;
- private String gender;
- private String nationality;
- private String ethnicGroup;
- private String marriageCondition;
- private String politicalStatus;
- private String contactNumber;
- private String idNumber;
- private String address;
- private String duringTime;
- private String relationship;
- private String School;
- private String passCheck;
- private String abroadZone;
- private List<String> url;
+/**
+ * @author Gss
+ * @date 2023.03.31. 17:47
+ * @desc 鎴愰暱缁忓巻 bean 绫�
+ */
+public class GrowthExperienceBean implements Serializable {
+ private String idName;
+ private String usedName;
+ private String gender;
+ private String nationality;
+ private String ethnicGroup;
+ private String marriageCondition;
+ private String politicalStatus;
+ private String contactNumber;
+ private String idNumber;
+ private String address;
+ private String duringTime;
+ private String relationship;
+ private String School;
+ private String passCheck;
+ private String abroadZone;
+ private List<String> url;
- public String getAddress() { return address; }
- public void setAddress(String value) { this.address = value; }
+ public String getAddress() { return address; }
+ public void setAddress(String value) { this.address = value; }
- public String getIdName() { return idName; }
- public void setIdName(String value) { this.idName = value; }
- public String getUsedName() { return usedName; }
- public void setUsedName(String value) { this.usedName = value; }
+ public String getIdName() { return idName; }
+ public void setIdName(String value) { this.idName = value; }
+ public String getUsedName() { return usedName; }
+ public void setUsedName(String value) { this.usedName = value; }
- public String getGender() { return gender; }
- public void setGender(String value) { this.gender = value; }
+ public String getGender() { return gender; }
+ public void setGender(String value) { this.gender = value; }
- public String getNationality() { return nationality; }
- public void setNationality(String value) { this.nationality = value; }
+ public String getNationality() { return nationality; }
+ public void setNationality(String value) { this.nationality = value; }
- public String getEthnicGroup() { return ethnicGroup; }
- public void setEthnicGroup(String value) { this.ethnicGroup = value; }
+ public String getEthnicGroup() { return ethnicGroup; }
+ public void setEthnicGroup(String value) { this.ethnicGroup = value; }
- public String getMarriageCondition() { return marriageCondition; }
- public void setMarriageCondition(String value) { this.marriageCondition = value; }
+ public String getMarriageCondition() { return marriageCondition; }
+ public void setMarriageCondition(String value) { this.marriageCondition = value; }
- public String getPoliticalStatus() { return politicalStatus; }
- public void setPoliticalStatus(String value) { this.politicalStatus = value; }
+ public String getPoliticalStatus() { return politicalStatus; }
+ public void setPoliticalStatus(String value) { this.politicalStatus = value; }
- public String getContactNumber() { return contactNumber; }
- public void setContactNumber(String value) { this.contactNumber = value; }
+ public String getContactNumber() { return contactNumber; }
+ public void setContactNumber(String value) { this.contactNumber = value; }
- public String getIdNumber() { return idNumber; }
- public void setIdNumber(String value) { this.idNumber = value; }
+ public String getIdNumber() { return idNumber; }
+ public void setIdNumber(String value) { this.idNumber = value; }
- public String getDuringTime() { return duringTime; }
- public void setDuringTime(String value) { this.duringTime = value; }
+ public String getDuringTime() { return duringTime; }
+ public void setDuringTime(String value) { this.duringTime = value; }
- public String getSchool() { return School; }
- public void setSchool(String value) { this.School = value; }
+ public String getSchool() { return School; }
+ public void setSchool(String value) { this.School = value; }
- public String getRelationship() { return relationship; }
- public void setRelationship(String value) { this.relationship = value; }
+ public String getRelationship() { return relationship; }
+ public void setRelationship(String value) { this.relationship = value; }
- public String getPassCheck() { return passCheck; }
- public void setPassCheck(String value) { this.passCheck = value; }
- public String getAbroadZone() { return abroadZone; }
- public void setAbroadZone(String value) { this.abroadZone = value; }
- public List<String> getUrl() { return url; }
- public void setUrl(List<String> value) { this.url = value; }
+ public String getPassCheck() { return passCheck; }
+ public void setPassCheck(String value) { this.passCheck = value; }
+ public String getAbroadZone() { return abroadZone; }
+ public void setAbroadZone(String value) { this.abroadZone = value; }
+ public List<String> getUrl() { return url; }
+ public void setUrl(List<String> value) { this.url = value; }
- }
+}
--
Gitblit v1.9.1