From be8a4a6f82bd32dc5a3cf2e038848012f336f644 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Nov 2023 08:20:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-manage/src/main/java/com/moral/api/service/HistorySecondCruiserService.java |    5 ++++-
 1 files changed, 4 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..fd16504 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,8 @@
     List<SpecialDevice> selectCruisers();
 
     //���������������������
-    List<CruiserDTO> getCruiserInFo(Map<String, Object> params);
+    Map<String,Object> getCruiserInFo(Map<String, Object> params);
+
+
+    Map<String,Object> getCruiserCompare(Map<String, Object> params);
 }

--
Gitblit v1.8.0