From dc81ce9d6ff037376dde7851b57df235249e1466 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 02 Nov 2023 11:31:09 +0800
Subject: [PATCH] 房屋出租情况查询修改

---
 src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java
index 96bedc1..078fa15 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java
@@ -59,9 +59,9 @@
 	@ApiModelProperty(value = "门牌地址编码")
 	private String houseCode;
 	/**
-	 * 租客关系(WGCCP_TENANT_RELATIONSHIP)
+	 * 租客关系 1: 同一户  2:不同一户
 	 */
-	@ApiModelProperty(value = "租客关系(WGCCP_TENANT_RELATIONSHIP)")
+	@ApiModelProperty(value = "租客关系 1: 同一户  2:不同一户")
 	private Integer tenantRelationship;
 	/**
 	 * 租房时间
@@ -77,26 +77,31 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date dueTime;
+
 	/**
-	 * 房屋状态(WGCCP_HOUSE_STATUS)
+	 * 终止时间
 	 */
-	@ApiModelProperty(value = "房屋状态(WGCCP_HOUSE_STATUS)")
+	@ApiModelProperty(value = "终止时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date terminationTime;
+
+	/**
+	 * 房屋状态 1:部分出租 2:全部出租
+	 */
+	@ApiModelProperty(value = "房屋状态 1:部分出租 2:全部出租")
 	private Integer houseStatus;
 	/**
-	 * 租房用途
+	 * 租房用途 1:仓库 2:办公 3:商用  4:居住
 	 */
-	@ApiModelProperty(value = "租房用途")
+	@ApiModelProperty(value = "租房用途 1:仓库 2:办公 3:商用  4:居住")
 	private Integer rentalUse;
 	/**
 	 * 合同附件URL
 	 */
 	@ApiModelProperty(value = "合同附件URL")
 	private String fileUrls;
-	/**
-	 * 审核状态
-	 */
-	@ApiModelProperty(value = "审核状态")
-	private Integer auditStatus;
+
 	/**
 	 * 创建人
 	 */

--
Gitblit v1.9.3