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/java/com/moral/mapper/ChannelMapper.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/ChannelMapper.java b/src/main/java/com/moral/mapper/ChannelMapper.java
index 6358e04..4d7cb46 100644
--- a/src/main/java/com/moral/mapper/ChannelMapper.java
+++ b/src/main/java/com/moral/mapper/ChannelMapper.java
@@ -12,4 +12,6 @@
List<Channel> getChannelList(@Param("channelName") String channelName);
+ List<Integer> getChannelId();
+
}
--
Gitblit v1.8.0