From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 c234957..c08e7d1 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
@@ -97,6 +97,7 @@
 	/** 0:否 1:是 */
 	@ApiModelProperty(value = "0:否 1:是", example = "")
 	@TableField("is_deleted")
+	@TableLogic
 	private Integer isDeleted;
 
 	/** 申请事由 */
@@ -142,4 +143,15 @@
 	@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;
+
 }

--
Gitblit v1.9.3