From 10b5e4880762d517c857ae76b098b8749a261fb0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 14:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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..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,10 +26,11 @@
import com.moral.api.websocket.CruiserWebSocketServer;
import com.moral.constant.KafkaConstants;
+/*
+ * ������������������������
+ **/
-*/
-/* * ������������������������
- **//*
+
@@ -121,4 +121,3 @@
}
}
-*/
--
Gitblit v1.8.0