解决冲突

jiangping

2023-09-14 cf9b836069e0a76571c6611642b2d7abb0586a2b

 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