Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

 src/main/java/com/moral/mapper/ChannelMapper.java

@@ -12,4 +12,6 @@

    List<Channel> getChannelList(@Param("channelName") String channelName);

    List<Integer> getChannelId();

}