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/BackblastPubRecordEntity.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java b/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
index e714a25..39dbbe8 100644
--- a/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
+++ b/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
@@ -30,7 +30,7 @@
* 房屋编码
*/
@ApiModelProperty(value = "房屋编码")
- private Long houseCode;
+ private String houseCode;
/**
* 记录民警姓名
*/
@@ -51,11 +51,35 @@
*/
@ApiModelProperty(value = "宣传现场照片")
private String pubUrls;
-
+ /**
+ * 网格编号
+ */
+ @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;
/** 创建时间 */
@@ -66,7 +90,7 @@
/** 更新人 */
@ApiModelProperty(value = "更新人", example = "")
- @TableField("update_user")
+ @TableField(value = "update_user",fill = FieldFill.UPDATE)
private Long updateUser;
/** 更新时间 */
@@ -78,5 +102,30 @@
/** 是否删除 0：否 1：是 */
@ApiModelProperty(value = "是否删除 0：否 1：是", example = "")
@TableField("is_deleted")
+ @TableLogic
private Integer isDeleted;
+
+ /** 是否下载国家反诈app 1：是 2：否 */
+ @ApiModelProperty(value = "是否下载国家反诈app 1：是 2：否", example = "")
+ private Integer isFzApp;
+
+ /** 是否打开预警功能 1：是 2：否 */
+ @ApiModelProperty(value = "是否打开预警功能 1：是 2：否", example = "")
+ private Integer isOpenAlarm;
+
+ /** 是否接受过其他反诈宣防内容 */
+ @ApiModelProperty(value = "是否接受过其他反诈宣防内容", example = "")
+ private Integer isOther;
+
+ /** 其他防诈内容 */
+ @ApiModelProperty(value = "其他防诈内容", example = "")
+ private String otherId;
+
+ @ApiModelProperty(value = "是否接受过其他反诈宣防内容", example = "")
+ @TableField("backblast_pub_flag")
+ private String backblastPubFlag;
+
+ @ApiModelProperty(value = "备注", example = "")
+ @TableField("remark")
+ private String remark;
}
--
Gitblit v1.9.3