From e986bd63309fba70f7f3cfaf70aadec46220917b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 30 三月 2023 20:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java |    4 +---
 1 files changed, 1 insertions(+), 3 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 cd69ba3..e7f2d55 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
@@ -172,7 +172,7 @@
 
                             ByteArrayOutputStream os = new ByteArrayOutputStream();
                             ImageIO.write(image, extension, os);
-                            ByteArrayInputStream inputStream1 = new ByteArrayInputStream(os.toByteArray());
+                            inputStream = new ByteArrayInputStream(os.toByteArray());
 
                     }
                     picData = ossService.uploadImages(inputStream, extension);
@@ -214,8 +214,6 @@
                     e.printStackTrace();
                 }
             }
-
-
         }
     }
 

--
Gitblit v1.8.0