From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
index ca0f84c..0db6532 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
@@ -126,8 +126,8 @@
 	@TableField("confirm_time")
 	private Date confirmTime;
 
-	/** 确认标记 1:待处理  2:处理中  3:已处理 */
-	@ApiModelProperty(value = "确认标记 1:待处理  2:处理中  3:已处理", example = "")
+	/** 状态 1:待审核  2:审核通过  3:审核不通过 4: 待提交(待接收) */
+	@ApiModelProperty(value = "状态 1:待审核  2:审核通过  3:审核不通过 4: 待提交(待接收)", example = "")
 	@TableField("confirm_flag")
 	private Integer confirmFlag;
 
@@ -143,4 +143,20 @@
 	@TableField("jw_grid_code")
 	private String jwGridCode;
 
+
+	/** 房东名称 */
+	@ApiModelProperty(value = "房东名称", example = "")
+	@TableField("landlord_name")
+	private String landlordName;
+
+	/** 房东电话 */
+	@ApiModelProperty(value = "房东电话", example = "")
+	@TableField("landlord_phone")
+	private String landlordPhone;
+
+	/** 1:否  2:是 */
+	@ApiModelProperty(value = "1:否  2:是", example = "")
+	@TableField("send_sms_flag")
+	private Integer sendSmsFlag;
+
 }

--
Gitblit v1.9.3