From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/email/entity/EmailTemplateEntity.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/email/entity/EmailTemplateEntity.java b/src/main/java/org/springblade/modules/email/entity/EmailTemplateEntity.java
index 2657390..04faaff 100644
--- a/src/main/java/org/springblade/modules/email/entity/EmailTemplateEntity.java
+++ b/src/main/java/org/springblade/modules/email/entity/EmailTemplateEntity.java
@@ -69,8 +69,8 @@
/** 是否已删除 */
@ApiModelProperty(value = "是否已删除", example = "")
- @TableField("is_delete")
- private Integer isDelete;
+ @TableField("is_deleted")
+ private Integer isDeleted;
/** 创建人 */
@ApiModelProperty(value = "创建人", example = "")
--
Gitblit v1.9.3