From 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 11 Mar 2024 15:40:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/smsTemplate/entity/SmsTemplateEntity.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/smsTemplate/entity/SmsTemplateEntity.java b/src/main/java/org/springblade/modules/smsTemplate/entity/SmsTemplateEntity.java
index d17ff87..e5192a2 100644
--- a/src/main/java/org/springblade/modules/smsTemplate/entity/SmsTemplateEntity.java
+++ b/src/main/java/org/springblade/modules/smsTemplate/entity/SmsTemplateEntity.java
@@ -94,6 +94,6 @@
 	 * 0:否 1:是
 	 */
 	@ApiModelProperty(value = "0:否 1:是", example = "")
-	@TableField("is_delete")
-	private String isDelete;
+	@TableField("is_deleted")
+	private String isDeleted;
 }

--
Gitblit v1.9.3