Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-30 628b80d0452602c5c02cec9ddbbee266f89d60c8

 ycl-server/src/main/java/com/ycl/task/OsdTask.java

@@ -130,6 +130,7 @@
    private OsdCheckResult getOsdCheckResult(OSDResult osdResult, TMonitor monitor) {
        OsdCheckResult osdCheckResult = new OsdCheckResult();
        osdCheckResult.setDeviceNo(osdResult.getSerialNumber());
        osdCheckResult.setNo(osdResult.getSerialNumber());
        osdCheckResult.setIp(monitor.getIp());
        osdCheckResult.setDeviceType(monitor.getCameraFunType());
        osdCheckResult.setCheckTime(osdResult.getCheckTime());