From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/resources/mapper/MenuMapper.xml | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml
index d77d0c5..79a4df8 100644
--- a/src/main/resources/mapper/MenuMapper.xml
+++ b/src/main/resources/mapper/MenuMapper.xml
@@ -110,14 +110,6 @@
</if>
</select>
- <select id="getChannelId" resultType="java.lang.Integer">
- select
- distinct
- channel_id
- from menu
- where is_delete=0
- </select>
-
<select id="getMenuListInfo" resultMap="ResultMap">
select
<include refid="Base_Column_List"/>
--
Gitblit v1.8.0