Merge remote-tracking branch 'origin/master'

fuliqi

2024-07-29 ad31fa93abe524baec2216f9b2f203acb8cc2d6a

 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();
}