From f6332b2e13e9cee67ee30646063e38c403554f89 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 29 Dec 2023 11:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java |   14 ++------------
 1 files changed, 2 insertions(+), 12 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..8d5eee4 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -133,20 +133,10 @@
 	@ApiModelProperty(value = "户籍类型 业务字典：residentType")
 	private Integer residentType;
 	/**
-	 * 户籍地址
+	 * 户籍登记地（户籍地址）
 	 */
-	@ApiModelProperty(value = "户籍地址")
-	private String residentAddr;
-	/**
-	 * 户籍登记地
-	 */
-	@ApiModelProperty(value = "户籍登记地")
+	@ApiModelProperty(value = "户籍登记地（户籍地址）")
 	private String hukouRegistration;
-	/**
-	 * 户籍地址编码
-	 */
-	@ApiModelProperty(value = "户籍地址编码")
-	private String residentAddrNo;
 	/**
 	 * 户籍地行政区划
 	 */

--
Gitblit v1.9.3