Merge branch 'wvp-28181-2.0' of https://github.91chi.fun/https://github.com...

mk1990

2022-03-28 c23a52929641484ed0b4ca728630f6d74872da8b

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

@@ -33,7 +33,7 @@
            "mediaServerId=#{mediaServerId}," +
            "status=${status} " +
            "WHERE app=#{app} AND stream=#{stream}")
    int updateByallAndStream(GbStream gbStream);
    int updateByAppAndStream(GbStream gbStream);

    @Update("UPDATE gb_stream " +
            "SET app=#{app}," +