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/TaskSchoolEvenEntity.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java
index ac77e31..ecd301d 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskSchoolEvenEntity.java
@@ -56,8 +56,8 @@
/** 描述 */
@ApiModelProperty(value = "描述", example = "")
- @TableField("describe")
- private String describe;
+ @TableField("remark")
+ private String remark;
/** 隐患类型 */
@ApiModelProperty(value = "隐患类型", example = "")
@@ -89,8 +89,8 @@
@TableField("work_image")
private String workImage;
- /** 确认标记 1：待审核 2：审核通过 3：审核不通过 */
- @ApiModelProperty(value = "确认标记 1：待审核 2：审核通过 3：审核不通过 ", example = "")
+ /** 确认标记 1：待审核 2：审核通过 3：审核不通过 4:待处理 */
+ @ApiModelProperty(value = "确认标记 1：待审核 2：审核通过 3：审核不通过 4:待处理 ", example = "")
@TableField("confirm_flag")
private String confirmFlag;
@@ -114,6 +114,10 @@
@ApiModelProperty(value = "确认意见", example = "")
@TableField("confirm_notion")
private String confirmNotion;
+ /** 地址编码 */
+ @ApiModelProperty(value = "地址编码", example = "")
+ @TableField("house_code")
+ private String houseCode;
/** 创建时间 */
@ApiModelProperty(value = "创建时间", example = "")
@@ -126,4 +130,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(value = "update_time",fill = FieldFill.UPDATE)
private Date updateTime;
+
+ @ApiModelProperty(value = "处理描述", example = "")
+ @TableField("handle_remark")
+ private String handleRemark;
}
--
Gitblit v1.9.3