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 |    6 +++---
 1 files changed, 3 insertions(+), 3 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..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
@@ -29,9 +29,9 @@
 
 
 */
-/*
- * ������������������������
- * *//*
+/* * ������������������������
+ **//*
+
 
 
 @Component

--
Gitblit v1.8.0