From 1cd453efd2f84dc15f964504c179c46f57267e90 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 10 三月 2023 09:50:31 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
index 058655d..39c4fcf 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
@@ -173,7 +173,7 @@
 
                             ByteArrayOutputStream os = new ByteArrayOutputStream();
                             ImageIO.write(image, extension, os);
-                            inputStream = new ByteArrayInputStream(os.toByteArray());
+                            ByteArrayInputStream inputStream1 = new ByteArrayInputStream(os.toByteArray());
 
                     }
                     picData = ossService.uploadImages(inputStream, extension);

--
Gitblit v1.8.0