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

648540858

2021-11-29 019827fd35f84465ee503fcc248b12a045da44d2

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

@@ -28,7 +28,7 @@
            "latitude=#{latitude}," +
            "mediaServerId=#{mediaServerId}," +
            "status=${status} " +
            "WHERE app=#{app} AND stream=#{stream} AND gbId=#{gbId}")
            "WHERE app=#{app} AND stream=#{stream}")
    int update(GbStream gbStream);

    @Delete("DELETE FROM gb_stream WHERE app=#{app} AND stream=#{stream}")