From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 19 三月 2025 15:50:03 +0800 Subject: [PATCH] fix: resolve merge conflicts in .gitignore --- ruoyi-applet/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java index cc805ad..60f09bb 100644 --- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java +++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java @@ -16,7 +16,6 @@ @RequestMapping("/monitor/server") public class ServerController { - @PreAuthorize("@ss.hasPermi('monitor:server:list')") @GetMapping() public AjaxResult getInfo() throws Exception { -- Gitblit v1.7.1