Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-23 f5e1051a7e6d3ffccc815a631d8be372d772c58f

 ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java

@@ -104,7 +104,9 @@
    @GetMapping("/getVideoCount/{cameraFunType}")
    public AjaxResult getVideoCount(@PathVariable String cameraFunType)
    {
        return success(tMonitorService.getVideoCount(cameraFunType));
        TMonitor tMonitor = new TMonitor();
        tMonitor.setCameraFunType(cameraFunType);
        return success(tMonitorService.getVideoCount(tMonitor));
    }

    /**