From 41660a11fb793295d44a4d47949284105e429395 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:56:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl-230812

---
 screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java |   12 ++++++++----
 1 files changed, 8 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 2fb4d1e..16e3944 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,3 +1,4 @@
+/*
 
 package com.moral.api.exception.consumer;
 
@@ -27,11 +28,13 @@
 import com.moral.constant.KafkaConstants;
 
 
-/*
- * ������������������������
- * */
+*/
+/* * ������������������������
+ **//*
 
-//@Component
+
+
+@Component
 @Slf4j
 public class CruiserDataConsumer  implements ConsumerSeekAware {
 
@@ -118,3 +121,4 @@
     }
 }
 
+*/

--
Gitblit v1.8.0