From 17244068535a9163ab1fd6b3be2a794d9a857879 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 15 八月 2024 17:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
index a726877..86f1149 100644
--- a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
+++ b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
@@ -28,7 +28,10 @@
      * 杞﹁締鏃堕挓鍑嗙‘鎬�
      */
     public static final String Car_ClockAccuracy = "carClockAccuracy";
-
+    /**
+     * 杞﹁締鐩綍涓�鑷寸巼
+     */
+    public static final String Car_DirectConsistent = "carDirectConsistent";
 
     /**
      * 浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�
@@ -50,8 +53,15 @@
      * 浜鸿劯鏃堕挓鍑嗙‘鎬�
      */
     public static final String Face_ClockAccuracy = "faceClockAccuracy";
+    /**
+     * 浜鸿劯鐩綍涓�鑷寸巼
+     */
+    public static final String Face_DirectConsistent = "faceDirectConsistent";
 
-
+    /**
+     * 涓�鏈轰竴妗f敞鍐岀巼銆佹。妗堣�冩牳姣�
+     */
+    public static final String Video_MonitorRegis_ArchiveRate = "videoMonitorRegisArchiveRate";
     /**
      * 涓�鏈轰竴妗e悎鏍肩巼
      */

--
Gitblit v1.8.0