Merge branch 'master' into dev

zjk

2026-07-31 8665daa7aa863f96d0d8f27c167edae1efc38022

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -154,7 +154,7 @@
        }
        if (deptService.checkDeptExistUser(deptId))
        {
            return warn("部门存在用户,不允许删除");
            return warn("操作失败：存在员工");
        }
        deptService.checkDeptDataScope(deptId);
        return AjaxResult.success(deptService.deleteDeptById(deptId));