From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 17:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-common/src/main/java/constant/CalculationStrategyConstants.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
index a726877..4497d08 100644
--- a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
+++ b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
@@ -28,6 +28,10 @@
      * 杞﹁締鏃堕挓鍑嗙‘鎬�
      */
     public static final String Car_ClockAccuracy = "carClockAccuracy";
+    /**
+     * 杞﹁締鐩綍涓�鑷寸巼
+     */
+    public static final String Car_DirectConsistent = "carDirectConsistent";
 
 
     /**
@@ -50,8 +54,16 @@
      * 浜鸿劯鏃堕挓鍑嗙‘鎬�
      */
     public static final String Face_ClockAccuracy = "faceClockAccuracy";
+    /**
+     * 浜鸿劯鐩綍涓�鑷寸巼
+     */
+    public static final String Face_DirectConsistent = "faceDirectConsistent";
 
 
+    /**
+     * 涓�鏈轰竴妗f敞鍐岀巼銆佹。妗堣�冩牳姣�
+     */
+    public static final String Video_MonitorRegis_ArchiveRate = "videoMonitorRegisArchiveRate";
     /**
      * 涓�鏈轰竴妗e悎鏍肩巼
      */
@@ -68,4 +80,8 @@
      * 骞冲彴鍦ㄧ嚎鐜�
      */
     public static final String Video_PlatformOnline = "videoPlatformOnline";
+    /**
+     * Osd鍑嗙‘鐜囧拰鏃堕棿鏍囨敞鍑嗙‘鐜�
+     */
+    public static final String Video_OsdTime = "videoOsdTime";
 }

--
Gitblit v1.8.0