From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
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 c2be6d5..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,10 +27,11 @@
import com.moral.constant.KafkaConstants;
-*/
/*
* ������������������������
- * *//*
+ *
+*/
+
@Component
@@ -121,4 +121,3 @@
}
}
-*/
--
Gitblit v1.8.0