From cf9b836069e0a76571c6611642b2d7abb0586a2b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 18:20:40 +0800
Subject: [PATCH] 解决冲突
---
server/platform/src/main/java/com/doumee/api/system/SystemMenuController.java | 5 -----
1 files changed, 0 insertions(+), 5 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..b21c9a9 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
@@ -50,13 +50,8 @@
@ApiOperation("鏌ヨ鍒楄〃鏍�")
@PostMapping("/treeList/{type}")
@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
}
@PreventRepeat
--
Gitblit v1.9.3