Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-18 807dc1fff85979874fbfc185918025e6b922ee3c

 ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java

@@ -145,7 +145,6 @@
//                按照Base64编码解析数据
                byte[] data = DatatypeConverter.parseBase64Binary(alarmParam.getPicData());
                InputStream inputStream = new ByteArrayInputStream(data);

                try {
//                    如果List<AlarmDataParam>合理
                    if (alarmParam.getAlarmData()!=null && alarmParam.getAlarmData().size()!=0) {