From 276818f5db0125c215ccd118dc7162172b92e3b3 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 23 五月 2023 17:35:47 +0800
Subject: [PATCH] 456

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java
index 455af82..0822d3f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java
@@ -102,7 +102,7 @@
         marryInfoDto.setName(myself.getName());
         marryInfoDto.setBirthday(myself.getBirthday());
         marryInfoDto.setAddress(myself.getAddress());
-        marryInfoDto.setWorkAddress(myself.getWorkAddress());
+        marryInfoDto.setIdNo(myself.getIdNo());
         marryInfoDto.setMarryStatus(myself.getMarryStatus());
         marryInfoDto.setSex(myself.getSex());
         marryInfoDto.setNation(myself.getNation());
@@ -112,7 +112,7 @@
         marryInfoDto.setSpouseName(spouse.getName());
         marryInfoDto.setSpouseBirthday(spouse.getBirthday());
         marryInfoDto.setSpouseAddress(spouse.getAddress());
-        marryInfoDto.setSpouseWorkAddress(spouse.getWorkAddress());
+        marryInfoDto.setSpouseIdNo(spouse.getIdNo());
         marryInfoDto.setSpouseMarryStatus(spouse.getMarryStatus());
         marryInfoDto.setSpouseSex(spouse.getSex());
         marryInfoDto.setSpouseNation(spouse.getNation());
@@ -149,7 +149,7 @@
         myself.setName(marryInfoDto.getName());
         myself.setBirthday(marryInfoDto.getBirthday());
         myself.setAddress(marryInfoDto.getAddress());
-        myself.setWorkAddress(marryInfoDto.getWorkAddress());
+        myself.setIdNo(marryInfoDto.getIdNo());
         myself.setMarryStatus(marryInfoDto.getMarryStatus());
         myself.setSex(marryInfoDto.getSex());
         myself.setMyId(userId);
@@ -163,7 +163,7 @@
         spouse.setName(marryInfoDto.getSpouseName());
         spouse.setBirthday(marryInfoDto.getSpouseBirthday());
         spouse.setAddress(marryInfoDto.getSpouseAddress());
-        spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
+        spouse.setIdNo(marryInfoDto.getSpouseIdNo());
         spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
         spouse.setSex(marryInfoDto.getSpouseSex());
         spouse.setNation(marryInfoDto.getSpouseNation());
@@ -219,7 +219,7 @@
         myself.setName(marryInfoDto.getName());
         myself.setBirthday(marryInfoDto.getBirthday());
         myself.setAddress(marryInfoDto.getAddress());
-        myself.setWorkAddress(marryInfoDto.getWorkAddress());
+        myself.setIdNo(marryInfoDto.getIdNo());
         myself.setMarryStatus(marryInfoDto.getMarryStatus());
         myself.setSex(marryInfoDto.getSex());
         myself.setNation(marryInfoDto.getNation());
@@ -252,7 +252,7 @@
             spouse.setName(marryInfoDto.getSpouseName());
             spouse.setBirthday(marryInfoDto.getSpouseBirthday());
             spouse.setAddress(marryInfoDto.getSpouseAddress());
-            spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
+            spouse.setIdNo(marryInfoDto.getSpouseIdNo());
             spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
             spouse.setSex(marryInfoDto.getSpouseSex());
             spouse.setNation(marryInfoDto.getSpouseNation());
@@ -284,7 +284,7 @@
             spouse.setName(marryInfoDto.getSpouseName());
             spouse.setBirthday(marryInfoDto.getSpouseBirthday());
             spouse.setAddress(marryInfoDto.getSpouseAddress());
-            spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
+            spouse.setIdNo(marryInfoDto.getSpouseIdNo());
             spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
             spouse.setSex(marryInfoDto.getSpouseSex());
             spouse.setNation(marryInfoDto.getSpouseNation());

--
Gitblit v1.9.1