From 0a8a799960bb05d162e8a9de4f5811587c679522 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Jun 2022 10:32:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=88=B7?=
 =?UTF-8?q?=E7=B1=8D=20=E5=9C=B0=E5=9D=80=20=E5=92=8C=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=9A=84=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemic/service/impl/EpidemicUserInfoServiceImpl.java    | 1 +
 .../house/excel/BaseResidentInformationUpdateExcel.java       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index c37689f..1601ceb 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -1414,6 +1414,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             } else {
 //                check.setRelation(baseResidentInformationExcel.getHouseHeadRelation());
                 check.setUserName(epidemicUserInfoEntity.getUserName());
+                check.setHouseholdRegisterName(epidemicUserInfoEntity.getHouseholdRegisterName());
                 check.setGender(epidemicUserInfoEntity.getGender());
                 check.setNation(epidemicUserInfoEntity.getNation());
                 check.setMobile(epidemicUserInfoEntity.getMobile());
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/excel/BaseResidentInformationUpdateExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/excel/BaseResidentInformationUpdateExcel.java
index 36a7421..4d24e53 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/excel/BaseResidentInformationUpdateExcel.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/excel/BaseResidentInformationUpdateExcel.java
@@ -84,8 +84,8 @@ public class BaseResidentInformationUpdateExcel implements Serializable {
     @Excel(name = "服兵役")
     private String military;
 
-//    @Excel(name = "户籍地")
-//    private String motorVehicleCategory;
+    @Excel(name = "户籍地")
+    private String householdRegisterName;
 
     @Excel(name = "现单位地址")
     private String currentEmployerAddress;