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

mrjackwang

2022-03-10 1cb2b2cc5f964573f56b54712ec023df6dcef843

 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@@ -753,7 +753,7 @@
      try {
         if (streamProxyMapper.update(streamProxyItem) > 0) {
            if (!StringUtils.isEmpty(streamProxyItem.getGbId())) {
               if (gbStreamMapper.update(streamProxyItem) > 0) {
               if (gbStreamMapper.update(streamProxyItem) < 0) {
                  //事务回滚
                  dataSourceTransactionManager.rollback(transactionStatus);
                  return false;