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

mk1990

2022-05-06 a2182b5a7ba0ffbba960e774e019a707b5bf26bb

 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}," +