From 5bc250393f8296f2f34dd9f3d5f1bfb47e8e5a0f Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期四, 16 十二月 2021 18:36:17 +0800
Subject: [PATCH] Merge branch 'master' of http://112.74.63.130:8088/r/XimengPole/XMPoleManager
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
index c734ea9..9e159e4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
@@ -25,13 +25,12 @@
}
/**
- * 妯$硦鏌ヨ
- *
+ * 鏌ヨ澶ф皵璁惧MAC鍦板潃
* @return
*/
- @GetMapping("/listAirDataByKeyword/{keyword}")
- public ResponseVO<Object> listAirDataByKeyword(@PathVariable String keyword) {
- List<AirData> list = airDataService.listAirDataByKeyword(keyword);
+ @GetMapping("/listAirEquipmentMAC")
+ public ResponseVO<Object> listAirEquipmentMAC() {
+ List<String> list = airDataService.listAirEquipmentMAC();
return ResponseUtil.successPage(list);
}
--
Gitblit v1.9.3