From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 02 Nov 2023 17:08:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
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