From 0c1ce2dd5f17e04ff0665847387b6f66de60e854 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 04 Nov 2023 23:04:16 +0800
Subject: [PATCH] 住户标签,房屋人员信息查询,删除接口新增调整

---
 src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 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 d0b2950..b119604 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java
@@ -29,6 +29,7 @@
 import java.io.Serializable;
 import java.util.Date;
 import org.springframework.format.annotation.DateTimeFormat;
+import sun.rmi.runtime.Log;
 
 /**
  * 住户 实体类
@@ -76,25 +77,34 @@
 	@ApiModelProperty(value = "绑定用户名称")
 	private String associatedUserName;
 	/**
+	 * 角色  0: 业主 1:出租户  2:空挂户 3:其他
+	 */
+	@ApiModelProperty(value = "角色  0: 业主 1:出租户  2:空挂户 3:其他")
+	private Integer roleType;
+	/**
 	 * 与角色关系
 	 */
 	@ApiModelProperty(value = "与角色关系")
 	private String relationship;
+
 	/**
-	 * 主要联系人
+	 * 是否主要联系人 1:是  0:否
 	 */
-	@ApiModelProperty(value = "主要联系人")
-	private String primaryContact;
+	@ApiModelProperty(value = "是否主要联系人 1:是  0:否")
+	private Integer isPrimaryContact;
+
 	/**
-	 * 居住状态(WGCCP_RESIDENTIAL_STATUS)
+	 * 居住状态 1: 是  0:否
 	 */
-	@ApiModelProperty(value = "居住状态(WGCCP_RESIDENTIAL_STATUS)")
-	private String residentialStatus;
+	@ApiModelProperty(value = "居住状态 1: 是  0:否")
+	private Integer residentialStatus;
+
 	/**
-	 * 性别(SEX)
+	 * 性别 1: 男 0:女  2: 未知
 	 */
-	@ApiModelProperty(value = "性别(SEX)")
+	@ApiModelProperty(value = "性别 1: 男 0:女  2: 未知")
 	private Short gender;
+
 	/**
 	 * 生日
 	 */
@@ -167,23 +177,19 @@
 	 */
 	@ApiModelProperty(value = "残疾证")
 	private String disabilityCert;
+
 	/**
-	 * 角色
+	 * 是否党员  1:党员  2:群众
 	 */
-	@ApiModelProperty(value = "角色")
-	private String roleType;
-	/**
-	 * 是否党员
-	 */
-	@ApiModelProperty(value = "是否党员")
-	private String partyEmber;
+	@ApiModelProperty(value = "是否党员  1:党员  2:群众")
+	private Integer partyEmber;
 
 	/**
 	 * 创建人
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty("创建人")
-	private String createUser;
+	private Long createUser;
 
 	/**
 	 * 创建时间
@@ -198,7 +204,7 @@
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty("更新人")
-	private String updateUser;
+	private Long updateUser;
 
 	/**
 	 * 更新时间

--
Gitblit v1.9.3