From ba1482bb35c4f44deb069eb086acd7ec3b536548 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期五, 31 十二月 2021 17:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 0b6bc99..b75bc35 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
@@ -22,7 +22,7 @@
@GetMapping
public ResponseVO<Object> listAirEquipment() {
List<AirEquipmentBo> list = airEquipmentService.listAirEquipment();
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
/**
@@ -33,7 +33,7 @@
@GetMapping("/listAirEquipmentByKeyword/{keyword}")
public ResponseVO<Object> listAirEquipmentByKeyword(@PathVariable String keyword) {
List<AirEquipmentBo> list = airEquipmentService.listAirEquipmentByKeyword(keyword);
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
@PostMapping("/delete/{id}")
--
Gitblit v1.9.3