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 |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 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 25b5156..39dbbe8 100644
--- a/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
+++ b/src/main/java/org/springblade/modules/backblast/entity/BackblastPubRecordEntity.java
@@ -79,7 +79,7 @@
 
 	/** 创建人 */
 	@ApiModelProperty(value = "创建人", example = "")
-	@TableField("create_user")
+	@TableField(value = "create_user",fill = FieldFill.INSERT)
 	private Long createUser;
 
 	/** 创建时间 */
@@ -90,7 +90,7 @@
 
 	/** 更新人 */
 	@ApiModelProperty(value = "更新人", example = "")
-	@TableField("update_user")
+	@TableField(value = "update_user",fill = FieldFill.UPDATE)
 	private Long updateUser;
 
 	/** 更新时间 */
@@ -104,4 +104,28 @@
 	@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