From fd68d9efbe525e9210f7013c1f103f197f01841c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Sep 2023 15:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb

---
 screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
index 16e3944..8ebcc3d 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
@@ -1,4 +1,3 @@
-/*
 
 package com.moral.api.exception.consumer;
 
@@ -28,9 +27,10 @@
 import com.moral.constant.KafkaConstants;
 
 
+/*
+ * ������������������������
+ *
 */
-/* * ������������������������
- **//*
 
 
 
@@ -121,4 +121,3 @@
     }
 }
 
-*/

--
Gitblit v1.8.0