From dcb98a36af4ad7823edd61a9c3388bd024db740f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Aug 2023 14:33:13 +0800
Subject: [PATCH] chore:测试提交
---
screen-manage/src/main/java/com/moral/api/controller/CruiserController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/CruiserController.java b/screen-manage/src/main/java/com/moral/api/controller/CruiserController.java
index 2c34812..651b23f 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/CruiserController.java
@@ -69,9 +69,9 @@
if (!params.containsKey("mac") || !params.containsKey("time1")|| !params.containsKey("time2")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- List<CruiserDTO> data = historySecondCruiserService.getCruiserInFo(params);
+ Map<String, Object> cruiserInFo = historySecondCruiserService.getCruiserInFo(params);
- return ObjectUtils.isEmpty(data)? ResultMessage.ok() : ResultMessage.ok(data);
+ return ObjectUtils.isEmpty(cruiserInFo)? ResultMessage.ok() : ResultMessage.ok(cruiserInFo);
}
--
Gitblit v1.8.0