From 96abc87da07408ef817d9086ea71ba4c287aa474 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 十二月 2024 11:52:07 +0800
Subject: [PATCH] Merge branch 'master-v5' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5
---
src/main/java/com/mzl/flower/web/system/AppMenuController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/system/AppMenuController.java b/src/main/java/com/mzl/flower/web/system/AppMenuController.java
index 517c0d3..870c06b 100644
--- a/src/main/java/com/mzl/flower/web/system/AppMenuController.java
+++ b/src/main/java/com/mzl/flower/web/system/AppMenuController.java
@@ -9,16 +9,14 @@
import com.mzl.flower.dto.request.system.CreateMenuDTO;
import com.mzl.flower.dto.request.system.UpdateAppMenuDTO;
import com.mzl.flower.dto.request.system.UpdateMenuDTO;
-import com.mzl.flower.dto.response.system.AppMenuDTO;
-import com.mzl.flower.dto.response.system.AppMenuTreeDTO;
-import com.mzl.flower.dto.response.system.MenuDTO;
-import com.mzl.flower.dto.response.system.MenuTreeDTO;
+import com.mzl.flower.dto.response.system.*;
import com.mzl.flower.entity.flower.FlowerCategory;
import com.mzl.flower.entity.log.OperationRecord;
import com.mzl.flower.entity.system.AppMenu;
import com.mzl.flower.entity.system.Menu;
import com.mzl.flower.service.system.AppMenuService;
import com.mzl.flower.service.system.MenuService;
+import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -119,7 +117,7 @@
@ApiOperation(value = "子账号有权限的菜单")
public ResponseEntity<ReturnDataDTO<?>> getPermissionMenu(){
- return returnData(R.SUCCESS.getCode(), menuService.getPermissionMenu());
+ return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(menuService.getPermissionMenu(), AppMenuSimpleDTO.class));
}
}
--
Gitblit v1.9.3