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

mrjackwang

2022-03-15 42901d03746d534d701ea3b8663e1c6d2c938c6d

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

@@ -772,7 +772,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;