From 1df231fd6aafa221aef3532d069c7e27d4331be7 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期日, 27 八月 2023 19:21:01 +0800
Subject: [PATCH] 功能全部完成

---
 app/src/main/java/com/application/zhangshi_app_android/bean/MarriageInfoBean.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/MarriageInfoBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/MarriageInfoBean.java
index 5c3c592..ec0a2ee 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/MarriageInfoBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/MarriageInfoBean.java
@@ -21,8 +21,8 @@
     private String workAddress;
     //鏈汉濠氬Щ鐘舵�� 0鏈 1鍒濆 2绂诲 3鍐嶅
     private int marryStatus;
-    //鏈汉鎬у埆 0濂� 1鐢�
-    private int sex;
+    //鏈汉鎬у埆
+    private String sex;
     //鏈汉姘戞棌
     private String nation;
     //鏈汉鐢佃瘽鍙风爜
@@ -43,8 +43,8 @@
     private String spouseWorkAddress;
     //閰嶅伓濠氬Щ鐘舵�� 0鏈 1鍒濆 2绂诲 3鍐嶅
     private int spouseMarryStatus;
-    //閰嶅伓鎬у埆 0濂� 1鐢�
-    private int spouseSex;
+    //閰嶅伓鎬у埆
+    private String spouseSex;
     //閰嶅伓姘戞棌
     private String spouseNation;
     //閰嶅伓鐢佃瘽鍙风爜
@@ -68,7 +68,7 @@
     //棰嗗彇鐙敓瀛愬コ璇佹椂闂�
     private String oneBornTime;
     //闇�瑕佸0鏄庣殑鎯呭喌
-    private String content;
+    private String notion;
     private String contentTime;
     //澶囨敞
     private String remark;
@@ -99,8 +99,8 @@
     public String getBirthday() { return birthday; }
     public void setBirthday(String value) { this.birthday = value; }
 
-    public String getContent() { return content; }
-    public void setContent(String value) { this.content = value; }
+    public String getNotion() { return notion; }
+    public void setNotion(String value) { this.notion = value; }
 
     public String getHandbookStatus() {
         return handbookStatus == 0 ? "鍚�" : "鏄�";
@@ -197,10 +197,10 @@
     public void setRemark(String value) { this.remark = value; }
 
     public String getSex() {
-        return sex == 0 ? "濂�" : "鐢�";
+        return sex;
     }
     public void setSex(String value) {
-        this.sex = value.equals("濂�") ? 0 : 1;
+        this.sex = value;
     }
 
     public String getSpouseAddress() { return spouseAddress; }
@@ -243,8 +243,8 @@
     public String getSpousePhone() { return spousePhone; }
     public void setSpousePhone(String value) { this.spousePhone = value; }
 
-    public int getSpouseSex() { return spouseSex; }
-    public void setSpouseSex(int value) { this.spouseSex = value; }
+    public String getSpouseSex() { return spouseSex; }
+    public void setSpouseSex(String value) { this.spouseSex = value; }
 
     public String getSpouseWorkAddress() { return spouseWorkAddress; }
     public void setSpouseWorkAddress(String value) { this.spouseWorkAddress = value; }
@@ -261,7 +261,7 @@
         private Object myId;
         private String nation;
         private String phone;
-        private int sex;
+        private String sex;
         private String workAddress;
 
         public String getAddress() { return address; }
@@ -300,8 +300,8 @@
         public String getPhone() { return phone; }
         public void setPhone(String value) { this.phone = value; }
 
-        public int getSex() { return sex; }
-        public void setSex(int value) { this.sex = value; }
+        public String getSex() { return sex; }
+        public void setSex(String value) { this.sex = value; }
 
         public String getWorkAddress() { return workAddress; }
         public void setWorkAddress(String value) { this.workAddress = value; }

--
Gitblit v1.9.1