Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

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

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

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

    List<Integer> getChannelId();

}