From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java |   38 +++++++++-----------------------------
 1 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
index a813cfe..ff36524 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -52,11 +52,6 @@
 	@ApiModelProperty(value = "绑定用户ID")
 	private Long associatedUserId;
 	/**
-	 * 绑定用户名称
-	 */
-	@ApiModelProperty(value = "绑定用户名称")
-	private String associatedUserName;
-	/**
 	 * 角色
 	 */
 	@ApiModelProperty(value = "角色")
@@ -108,16 +103,6 @@
 	@ApiModelProperty(value = "证件号码")
 	private String cardNo;
 	/**
-	 * 港澳台通行证
-	 */
-	@ApiModelProperty(value = "港澳台通行证")
-	private String hkmtPass;
-	/**
-	 * 护照
-	 */
-	@ApiModelProperty(value = "护照")
-	private String passport;
-	/**
 	 * 民族
 	 */
 	@ApiModelProperty(value = "民族")
@@ -133,20 +118,10 @@
 	@ApiModelProperty(value = "户籍类型 业务字典：residentType")
 	private Integer residentType;
 	/**
-	 * 户籍地址
+	 * 户籍登记地（户籍地址）
 	 */
-	@ApiModelProperty(value = "户籍地址")
-	private String residentAddr;
-	/**
-	 * 户籍登记地
-	 */
-	@ApiModelProperty(value = "户籍登记地")
+	@ApiModelProperty(value = "户籍登记地（户籍地址）")
 	private String hukouRegistration;
-	/**
-	 * 户籍地址编码
-	 */
-	@ApiModelProperty(value = "户籍地址编码")
-	private String residentAddrNo;
 	/**
 	 * 户籍地行政区划
 	 */
@@ -230,9 +205,14 @@
 	@ApiModelProperty(value = "其他联系方式")
 	private String otherContact;
 	/**
-	 * 现居住地址
+	 * 居住地行政区划
 	 */
-	@ApiModelProperty(value = "现居住地址")
+	@ApiModelProperty(value = "居住地行政区划")
+	private String homeAdcode;
+	/**
+	 * 现居住地址(居住地址)
+	 */
+	@ApiModelProperty(value = "现居住地址(居住地址)")
 	private String currentAddress;
 	/**
 	 * 残疾证

--
Gitblit v1.9.3