Merge remote-tracking branch 'origin/master'

fuliqi

2024-07-31 f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c

 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java

@@ -68,7 +68,7 @@
     * @param cameraFunType 类型
     * @return 统计数
     */
    Map<String, String> getVideoCount(String cameraFunType);
    Map<String, String> getVideoCount(TMonitor tMonitor);

    Map<String, String> recoveryException();
}