Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

fine

2024-01-09 8874c90db2c238fa4c55df491675fe7fec9d93b2

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

@@ -103,6 +103,9 @@
            "</script>")
    void delByAppAndStreamsByPlatformId(@Param("gbStreams") List<GbStream> gbStreams, @Param("platformId") String platformId);

    @Delete("DELETE from wvp_platform_gb_stream WHERE platform_id=#{platformId} and catalog_id=#{catalogId}")
    @Delete("<script> "+
            "DELETE from wvp_platform_gb_stream WHERE platform_id=#{platformId}" +
            " <if test='catalogId != null' >  and catalog_id=#{catalogId}</if>" +
            "</script>")
    int delByPlatformAndCatalogId(@Param("platformId") String platformId, @Param("catalogId") String catalogId);
}