From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb

---
 screen-manage/src/main/java/com/moral/api/service/HistorySecondCruiserService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/HistorySecondCruiserService.java b/screen-manage/src/main/java/com/moral/api/service/HistorySecondCruiserService.java
index 37b16df..00c00c1 100644
--- a/screen-manage/src/main/java/com/moral/api/service/HistorySecondCruiserService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/HistorySecondCruiserService.java
@@ -25,5 +25,5 @@
     List<SpecialDevice> selectCruisers();
 
     //���������������������
-    List<CruiserDTO> getCruiserInFo(Map<String, Object> params);
+    Map<String,Object> getCruiserInFo(Map<String, Object> params);
 }

--
Gitblit v1.8.0