From 3364d6efd58eca1d6acf129948265b1e663dae7a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 13:38:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
index 86f1149..4497d08 100644
--- a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
+++ b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
@@ -33,6 +33,7 @@
      */
     public static final String Car_DirectConsistent = "carDirectConsistent";
 
+
     /**
      * 浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�
      */
@@ -58,6 +59,7 @@
      */
     public static final String Face_DirectConsistent = "faceDirectConsistent";
 
+
     /**
      * 涓�鏈轰竴妗f敞鍐岀巼銆佹。妗堣�冩牳姣�
      */
@@ -78,4 +80,8 @@
      * 骞冲彴鍦ㄧ嚎鐜�
      */
     public static final String Video_PlatformOnline = "videoPlatformOnline";
+    /**
+     * Osd鍑嗙‘鐜囧拰鏃堕棿鏍囨敞鍑嗙‘鐜�
+     */
+    public static final String Video_OsdTime = "videoOsdTime";
 }

--
Gitblit v1.8.0