From 2ab1de34b119570c99946ab3e480e9d31745518a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Jan 2022 17:28:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-common/src/main/java/com/moral/constant/KafkaConstants.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/constant/KafkaConstants.java b/screen-common/src/main/java/com/moral/constant/KafkaConstants.java
index 3f58d3c..7ec3107 100644
--- a/screen-common/src/main/java/com/moral/constant/KafkaConstants.java
+++ b/screen-common/src/main/java/com/moral/constant/KafkaConstants.java
@@ -37,7 +37,6 @@
     * */
     public static final String CRUISER_TOPIC_HOUR = "cruiser_hour_data";
 
-
     /**
      * ���������������������������
      */

--
Gitblit v1.8.0