From 931734244f977a65dd35c6f606afb999d7c3c967 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 11:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 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