From a5a0a3c29a97c807cda8846994d1d8df6adeb9e5 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:09:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin
---
oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java b/oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java
index 27eaf86..f780bc1 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/MonitorController.java
@@ -1,5 +1,6 @@
package com.oying.modules.system.rest;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -25,6 +26,6 @@
@ApiOperation("查询服务监控")
@PreAuthorize("@el.check('monitor:list')")
public ResponseEntity<Object> queryMonitor(){
- return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(serverService.getServers()),HttpStatus.OK);
}
}
--
Gitblit v1.9.3