Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-15 cf8a22f50b81fa30abaa518bdce660cd65deabea

 src/main/java/com/genersoft/iot/vmp/storager/dao/PatformChannelMapper.java

@@ -18,7 +18,7 @@
     */
    @Select("<script> "+
            "SELECT deviceAndChannelId FROM platform_gb_channel WHERE platformId='${platformId}' AND deviceAndChannelId in" +
            "<foreach collection='deviceAndChannelIds' open='(' item='id_' separator=',' close=')'> '${id_}'</foreach>" +
            "<foreach collection='deviceAndChannelIds' open='(' item='id_' separator=',' close=')'> '${id_}'</foreach> ORDER BY deviceAndChannelId ASC" +
            "</script>")
    List<String> findChannelRelatedPlatform(String platformId, List<String> deviceAndChannelIds);