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

---
 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 c2be6d5..ccc1fb0 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,8 @@
 import com.moral.constant.KafkaConstants;
 
 
-*/
-/*
- * ������������������������
- * *//*
+/* * ������������������������
+ **/
 
 
 @Component
@@ -121,4 +118,3 @@
     }
 }
 
-*/

--
Gitblit v1.8.0