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

mk1990

2022-06-22 0c4a8c09757ce855fd877fd7b896b5295c4dd26b

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

@@ -78,7 +78,7 @@
            "left join platform_gb_stream pgs on " +
            "pp.serverGBId = pgs.platformId " +
            "left join gb_stream gs " +
            "gs.gbStreamId = pgs.gbStreamId " +
            "on gs.gbStreamId = pgs.gbStreamId " +
            "WHERE " +
            "gs.app = #{app} " +
            "AND gs.stream = #{stream}" +