From a7a57c08a3c632bfc7fc82b8015167022c2d8505 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 14 九月 2023 18:23:37 +0800
Subject: [PATCH] #自测修改

---
 server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
index dd474e5..51522dd 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java
@@ -48,15 +48,10 @@
     }
 
     @ApiOperation("鏌ヨ鍒楄〃鏍�")
-    @PostMapping("/treeList/{type}")
+    @PostMapping("/treeList")
     @RequiresPermissions("system:menu:query")
-<<<<<<< HEAD
-    public ApiResponse<List<SystemMenuListVO>> findTree ( @RequestBody SystemMenu systemMenu ) {
-        return ApiResponse.success(systemMenuBiz.findTree());
-=======
-    public ApiResponse<List<SystemMenuListVO>> findTree (@PathVariable Integer type) {
-        return ApiResponse.success(systemMenuBiz.findTreeByType(type));
->>>>>>> a7e6a3b52c64ba9add0ceb643d6915473a7770a4
+    public ApiResponse<List<SystemMenuListVO>> findTree () {
+        return ApiResponse.success(systemMenuBiz.findTreeByType(0));
     }
 
     @PreventRepeat

--
Gitblit v1.9.3