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/ChannelMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/ChannelMapper.xml b/src/main/resources/mapper/ChannelMapper.xml
index d9c5039..95532ce 100644
--- a/src/main/resources/mapper/ChannelMapper.xml
+++ b/src/main/resources/mapper/ChannelMapper.xml
@@ -30,4 +30,12 @@
and channel_name like concat('%',#{channelName},'%')
</if>
</select>
+
+ <select id="getChannelId" resultType="java.lang.Integer">
+ select
+ distinct
+ id
+ from channel
+ where channel_is_delete=1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0