Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-04 38b44e0c9996f06524903417f1d0a3f746b4550b

 ycl-platform/src/main/java/com/ycl/util/VideoUtil.java

@@ -210,7 +210,7 @@
        jsonBody.put("expand","transcode=1&videotype=h264");
        String body = jsonBody.toString();
        //参数根据接口实际情况设置
        HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, query, null, "application/json", head);
        HttpResponse result = ArtemisHttpUtil.doPostStringImgArtemis(config, path, body, null, null, "application/json", null);
        System.out.println("海康完成请求");
        try {
            String strResult = EntityUtils.toString(result.getEntity());