Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 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>