From 2ab1de34b119570c99946ab3e480e9d31745518a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Jan 2022 17:28:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 39012ba..ac6fdb9 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -38,7 +38,7 @@
@GetMapping("selectCruisers")
@ApiOperation(value = "������������������������������������������", notes = "���������������")
public ResultMessage getCarsInfo() {
- List<Map<String, Object>> response = specialDeviceService.getCarsInfo();
+ List<Map<String, Object>> response = specialDeviceService.selectCruisers();
return ResultMessage.ok(response);
}
--
Gitblit v1.8.0