Merge remote-tracking branch 'origin/dev' into dev

yami-shop-service/src/main/resources/mapper/ChannelMapper.xml

@@ -28,7 +28,7 @@
                 and c.status = #{channel.status}
             </if>
             <if test="channel.channelIdList != null and  !channel.channelIdList.isEmpty()">
-                and o.channel_id  in
+                and c.id  in
                 <foreach collection="channel.channelIdList" item="channelId" open="(" close=")" separator=",">
                     #{channelId}
                 </foreach>