From a64fc9cd8910806853212ad4e5433cf35e4a59c3 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Tue, 1 Aug 2023 15:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/SysMenuMapper.xml   | 20 +++++++++----------
 .../java/com/cool/store/entity/SysMenuDO.java |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml
index 06ce974e4..cd50cf28d 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml
@@ -9,13 +9,13 @@
         <result column="path" jdbcType="VARCHAR" property="path"/>
         <result column="sort" jdbcType="INTEGER" property="sort"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
-        <result column="is_deleted" jdbcType="INTEGER" property="isDeleted"/>
+        <result column="deleted" jdbcType="BIT" property="deleted"/>
         <result column="icon" jdbcType="VARCHAR" property="icon"/>
         <result column="menu_type" jdbcType="TINYINT" property="menuType"/>
         <result column="env" jdbcType="VARCHAR" property="env"/>
     </resultMap>
     <sql id="Base_Column_List">
-        id, parent_id, code, name, path, sort, remark, is_deleted, icon, menu_type, env
+        id, parent_id, code, name, path, sort, remark, deleted, icon, menu_type, env
     </sql>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
         insert into sys_menu
@@ -38,8 +38,8 @@
             <if test="remark != null">
                 remark,
             </if>
-            <if test="isDeleted != null">
-                is_deleted,
+            <if test="deleted != null">
+                deleted,
             </if>
             <if test="icon != null">
                 icon,
@@ -70,8 +70,8 @@
             <if test="remark != null">
                 #{remark},
             </if>
-            <if test="isDeleted != null">
-                #{isDeleted},
+            <if test="deleted != null">
+                #{deleted},
             </if>
             <if test="icon != null">
                 #{icon},
@@ -106,8 +106,8 @@
                 <if test="record.remark != null">
                     remark = #{record.remark},
                 </if>
-                <if test="record.isDeleted != null">
-                    is_deleted = #{record.isDeleted},
+                <if test="record.deleted != null">
+                    deleted = #{record.deleted},
                 </if>
                 <if test="record.icon != null">
                     icon = #{record.icon},
@@ -129,7 +129,7 @@
         from
           sys_menu
         where
-          is_deleted = '0'
+        deleted = '0'
           <if test="list!=null and list.size>0">
               and parent_id in
               <foreach collection="list" item="parentId" open="(" close=")" separator=",">
@@ -149,7 +149,7 @@
         update
             sys_menu
         set
-            is_deleted = '1'
+            deleted = '1'
         where
         id in
         <foreach collection="list" open="(" item="item" separator="," close=")">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java
index f5c804c50..d9f6b198a 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java
@@ -39,7 +39,7 @@ public class SysMenuDO implements Serializable {
     private String remark;
 
     @ApiModelProperty("是否已删除")
-    private Integer isDeleted;
+    private Boolean deleted;
 
     @ApiModelProperty("图标")
     private String icon;