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/mapper/SmsTemplateMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/smsTemplate/mapper/SmsTemplateMapper.xml b/src/main/java/org/springblade/modules/smsTemplate/mapper/SmsTemplateMapper.xml
index d38f610..3159064 100644
--- a/src/main/java/org/springblade/modules/smsTemplate/mapper/SmsTemplateMapper.xml
+++ b/src/main/java/org/springblade/modules/smsTemplate/mapper/SmsTemplateMapper.xml
@@ -20,7 +20,7 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createBy"    column="create_by"    />
-        <result property="isDelete"    column="is_delete"    />
+        <result property="isDeleted"    column="is_deleted"    />
     </resultMap>
 
     <sql id="selectBladeSmsTemplate">
@@ -31,7 +31,7 @@
             create_time,
             update_time,
             create_by,
-            is_delete
+            is_deleted
         from
             blade_sms_template
     </sql>
@@ -51,7 +51,7 @@
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="createBy != null "> and create_by = #{createBy}</if>
-            <if test="isDelete != null  and isDelete != ''"> and is_delete = #{isDelete}</if>
+            <if test="isDeleted != null  and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
         </where>
     </select>
 

--
Gitblit v1.9.3