From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java |   64 ++++++++++++++++----------------
 1 files changed, 32 insertions(+), 32 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..327bf86 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -52,19 +52,14 @@
 	@ApiModelProperty(value = "绑定用户ID")
 	private Long associatedUserId;
 	/**
-	 * 绑定用户名称
-	 */
-	@ApiModelProperty(value = "绑定用户名称")
-	private String associatedUserName;
-	/**
 	 * 角色
 	 */
 	@ApiModelProperty(value = "角色")
 	private Integer roleType;
 	/**
-	 * 与角色关系
+	 * 与业主关系
 	 */
-	@ApiModelProperty(value = "与角色关系")
+	@ApiModelProperty(value = "与业主关系")
 	private Integer relationship;
 
 	/**
@@ -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;
 	/**
 	 * 残疾证
@@ -287,7 +267,7 @@
 	/**
 	 * 是否删除
 	 */
-	@TableLogic
+	// @TableLogic
 	@ApiModelProperty("是否已删除 0:否  1:是")
 	private Integer isDeleted;
 
@@ -303,4 +283,24 @@
 	@ApiModelProperty("出租屋id")
 	private  Long housingRentalId;
 
+	/** 自愿者组织 */
+	@ApiModelProperty(value = "自愿者组织", example = "")
+	@TableField("volunteer_org")
+	private String volunteerOrg;
+
+
+	@ApiModelProperty(value = "房东名称", example = "")
+	@TableField("landlord_name")
+	private String landlordName;
+
+
+	@ApiModelProperty(value = "房东电话", example = "")
+	@TableField("landlord_phone")
+	private String landlordPhone;
+
+	@ApiModelProperty(value = "房东身份证", example = "")
+	@TableField("landlord_id_card")
+	private String landlordIdCard;
+
+
 }

--
Gitblit v1.9.3