From f0837ee21f7650d4413830d4ee90da02bcdd6d36 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 10:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java |    8 ++------
 1 files changed, 2 insertions(+), 6 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 32c1fe2..84ee302 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;
 
@@ -27,12 +26,10 @@
 import com.moral.api.websocket.CruiserWebSocketServer;
 import com.moral.constant.KafkaConstants;
 
-
-*/
 /*
  * ������������������������
- *
-*//*
+ **/
+
 
 
 
@@ -124,4 +121,3 @@
     }
 }
 
-*/

--
Gitblit v1.8.0