Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-30 e986bd63309fba70f7f3cfaf70aadec46220917b

 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();
                }
            }


        }
    }