From ec1f20c31d64ddbc5242c3942902bc5233a8a140 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 四月 2025 10:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
index 8aced92..aab1419 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
@@ -4,7 +4,7 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.domain.Server;
/**
@@ -18,10 +18,10 @@
{
@PreAuthorize("@ss.hasPermi('monitor:server:list')")
@GetMapping()
- public Result getInfo() throws Exception
+ public AjaxResult getInfo() throws Exception
{
Server server = new Server();
server.copyTo();
- return Result.success(server);
+ return AjaxResult.success(server);
}
}
--
Gitblit v1.9.3