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 | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 0268baf..0db6532 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskResidencePermitApplyEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.task.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
@@ -78,13 +75,13 @@
/** 创建时间 */
@ApiModelProperty(value = "创建时间", example = "")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField("create_time")
+ @TableField(value = "create_time",fill = FieldFill.INSERT)
private Date createTime;
/** 更新时间 */
@ApiModelProperty(value = "更新时间", example = "")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField("update_time")
+ @TableField(value = "update_time",fill = FieldFill.UPDATE)
private Date updateTime;
/** 创建人 */
@@ -100,6 +97,7 @@
/** 0：否 1：是 */
@ApiModelProperty(value = "0：否 1：是", example = "")
@TableField("is_deleted")
+ @TableLogic
private Integer isDeleted;
/** 申请事由 */
@@ -128,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;
@@ -145,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