From e97ceb166fc4c06cc878398a8e4dc27211f28833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=A2=E7=BB=A7=E6=A3=AE?= <1933694610@qq.com>
Date: Tue, 25 Mar 2025 14:00:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=A7=92=E8=89=B2=E6=97=B6=E5=90=8E=E7=AB=AF=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/controller/system/SysMenuController.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java
index 2019aa3d..da9365af 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java
@@ -3,7 +3,6 @@ package org.ruoyi.system.controller.system;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
 import cn.dev33.satoken.annotation.SaMode;
-import cn.hutool.core.lang.tree.Tree;
 import lombok.RequiredArgsConstructor;
 import org.ruoyi.common.core.constant.TenantConstants;
 import org.ruoyi.common.core.constant.UserConstants;
@@ -86,9 +85,11 @@ public class SysMenuController extends BaseController {
     }, mode = SaMode.OR)
     @SaCheckPermission("system:menu:query")
     @GetMapping("/treeselect")
-    public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
+    public R<MenuTreeSelectVo> treeselect(SysMenuBo menu) {
         List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
-        return R.ok(menuService.buildMenuTreeSelect(menus));
+        MenuTreeSelectVo selectVo = new MenuTreeSelectVo();
+        selectVo.setMenus(menuService.buildMenuTreeSelect(menus));
+        return R.ok(selectVo);
     }
 
     /**

From 4f7a873458f17537ee37fd9f409c349f6f63a292 Mon Sep 17 00:00:00 2001
From: ageer <ageerle@163.com>
Date: Tue, 25 Mar 2025 20:32:40 +0800
Subject: [PATCH 2/3] feat: 2

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 062b7b35..33829081 100644
--- a/README.md
+++ b/README.md
@@ -181,12 +181,6 @@ RuoYi-AI
 
 该项目使用Git进行版本管理。您可以在repository参看当前可用版本。
 
-### 进群学习
-
-<div>
-  <img src="image/01.png" alt="drawing" width="300px" height="300px"/>
-</div>
-
 ### 版权说明
 
 该项目使用了MIT授权许可，详情请参阅 [LICENSE.txt](https://github.com/ageerle/ruoyi-ai/blob/main/LICENSE)

From ff149d6177594202958176e54e72afa23a252758 Mon Sep 17 00:00:00 2001
From: stxyg <929759861@qq.com>
Date: Wed, 26 Mar 2025 18:17:40 +0800
Subject: [PATCH 3/3] remove  duplicate in common-chat's pom

---
 ruoyi-common/ruoyi-common-chat/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-chat/pom.xml b/ruoyi-common/ruoyi-common-chat/pom.xml
index aba4a0f6..b06f19c1 100644
--- a/ruoyi-common/ruoyi-common-chat/pom.xml
+++ b/ruoyi-common/ruoyi-common-chat/pom.xml
@@ -102,10 +102,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>cn.bigmodel.openapi</groupId>