Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-03-10 1cd453efd2f84dc15f964504c179c46f57267e90

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