Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

2 天以前 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

 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()