Merge branch 'dev_New' into jtwy

zss

2026-02-06 5cb362d364fa8582b2090e0d81585f4a7e9f19a1

 src/main/java/com/ruoyi/project/monitor/controller/ServerController.java

@@ -4,7 +4,6 @@
import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.framework.web.controller.BaseController;

import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.framework.web.domain.Server;



@@ -15,7 +14,7 @@
 */

@RestController

@RequestMapping("/monitor/server")

public class ServerController extends BaseController

public class ServerController

{

    @PreAuthorize("@ss.hasPermi('monitor:server:list')")

    @GetMapping()