From ae2e17d478f444a5c9c054dc13b83a0dbdd750bd Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 30 六月 2022 11:35:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
index d94667b..5c04267 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java
@@ -28,7 +28,7 @@
* @return
*/
@GetMapping("/listAirEquipment")
- public ResponseVO<Object> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ public ResponseVO<Object> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -49,8 +49,4 @@
}
}
- @GetMapping("/getAirEquipment/{mac}")
- public ResponseVO<Object> getAirEquipment(@PathVariable String mac) {
- return ResponseUtil.success(airEquipmentService.getAirEquipment(mac));
- }
}
--
Gitblit v1.9.3