From 52f100ec7860c781c1b44259c6c54b221a30c100 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 24 May 2021 17:11:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 56e6c5d..64a0bd7 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -18,7 +18,7 @@
<sql id="Base_Column_List">
- mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete
+ mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete,mm.desc
</sql>
@@ -74,6 +74,9 @@
<if test="order != null">
`order`,
</if>
+ <if test="desc != null">
+ `desc`,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">
@@ -90,6 +93,9 @@
</if>
<if test="order != null">
#{order},
+ </if>
+ <if test="desc != null">
+ #{desc},
</if>
</trim>
</insert>
@@ -114,6 +120,9 @@
</if>
<if test="is_delete != null">
is_delete = #{is_delete},
+ </if>
+ <if test="desc != null">
+ `desc` = #{desc},
</if>
</set>
where id = #{id}
@@ -175,6 +184,9 @@
<if test="order != null">
and mm.order = #{order}
</if>
+ <if test="desc != null">
+ and mm.desc = #{order}
+ </if>
limit #{start},#{number}
</select>
--
Gitblit v1.8.0