From df6867ee052790c3d690f341c422540e47ae5ec3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 16 一月 2023 10:52:14 +0800
Subject: [PATCH] update 优化 默认开启复杂结构 resultMap 自动映射 简化xml编码(多结构实体需带上主键id)

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