From 9c368e8e68f769ee76a968033f9806787b7d857c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 28 十一月 2022 13:57:30 +0800 Subject: [PATCH] update springboot 2.7.5 => 2.7.6 update lock4j 2.2.2 => 2.2.3 update s3-adk 1.12.324 => 1.12.349 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 2000fd0..e80f0ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -117,10 +117,10 @@ @DeleteMapping("/{menuId}") public R<Void> remove(@PathVariable("menuId") Long menuId) { if (menuService.hasChildByMenuId(menuId)) { - return R.fail("瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�"); + return R.warn("瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�"); } if (menuService.checkMenuExistRole(menuId)) { - return R.fail("鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�"); + return R.warn("鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�"); } return toAjax(menuService.deleteMenuById(menuId)); } -- Gitblit v1.9.3