Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-08 01a30369e55a754c28dec4939a99e59aefecdc60

 ycl-server/src/main/java/com/ycl/feign/UYClient.java

@@ -50,7 +50,7 @@
     * osd标注信息
     * @return
     */
    @GetMapping("/videomon/api/v1/app/osdMonitor/list")
    @GetMapping("/videomon-ocr/api/v1/osd/format/list")
    JSONObject osdMonitorList(@SpringQueryMap OsdMonitorParam param, @RequestHeader("tenantId") String tenantId);

    /**