Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 1b1edb1dc000b248f8d47dbf2c0292b863ca38da

 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java

@@ -68,7 +68,7 @@
    private String osdPart;

    /**
     * osd 左下角
     * osd左下角
     */
    private String osdLB;

@@ -78,7 +78,7 @@
    private Integer osdTimeCorrect;

    /**
     * osd通道名是否正确
     * osd通道名是否正确   1正确  0未知  -1错
     */
    private Integer osdNameCorrect;
    /**