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/backblast/entity/BackblastWarnHanRecEntity.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/backblast/entity/BackblastWarnHanRecEntity.java b/src/main/java/org/springblade/modules/backblast/entity/BackblastWarnHanRecEntity.java
index d202370..38f8519 100644
--- a/src/main/java/org/springblade/modules/backblast/entity/BackblastWarnHanRecEntity.java
+++ b/src/main/java/org/springblade/modules/backblast/entity/BackblastWarnHanRecEntity.java
@@ -25,12 +25,11 @@
@ApiModelProperty(value = "主键ID", example = "")
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
-
/**
* 房屋编码
*/
@ApiModelProperty(value = "房屋编码")
- private Long houseCode;
+ private String houseCode;
/**
* 记录民警姓名
*/
@@ -51,10 +50,35 @@
*/
@ApiModelProperty(value = "现场照片")
private String sceUrls;
+ /**
+ * 网格编号
+ */
+ @ApiModelProperty(value = "网格编号")
+ private String gridCode;
+ /**
+ * 警务网格编号
+ */
+ @ApiModelProperty(value = "警务网格编号")
+ private String jwGridCode;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String lng;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+ /**
+ * 地址
+ */
+ @ApiModelProperty(value = "地址")
+ private String address;
/** 创建人 */
@ApiModelProperty(value = "创建人", example = "")
- @TableField("create_user")
+ @TableField(value = "create_user",fill = FieldFill.INSERT)
private Long createUser;
/** 创建时间 */
@@ -65,7 +89,7 @@
/** 更新人 */
@ApiModelProperty(value = "更新人", example = "")
- @TableField("update_user")
+ @TableField(value = "update_user",fill = FieldFill.UPDATE)
private Long updateUser;
/** 更新时间 */
@@ -77,5 +101,6 @@
/** 是否删除 0：否 1：是 */
@ApiModelProperty(value = "是否删除 0：否 1：是", example = "")
@TableField("is_deleted")
+ // @TableLogic
private Integer isDeleted;
}
--
Gitblit v1.9.3