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

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

 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>