From 65e0bd8ca45b0611ca567ec45071f9e7feec2bff Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 09 十一月 2024 01:17:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index d065a32..f0db871 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -263,7 +263,7 @@
}
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
- functionVO.setSource(menu.image);
+ functionVO.setSource(menu.icon);
//if(StringUtils.isBlank(menu.resourceB)){
// continue;
//}
@@ -438,11 +438,12 @@
* @param funcInfo
* @return
*/
- private MenuVO functionInfoToMenuVO(FunctionInfo funcInfo){
+ private MenuVO functionInfoToMenuVO(FunctionInfo funcInfo)
+ {
MenuVO menuVO = new MenuVO();
menuVO.setId(funcInfo.id);
- menuVO.setValid(funcInfo.isValid);
- menuVO.setSource(funcInfo.image);
+ menuVO.setIsValid(funcInfo.isValid);
+ menuVO.setSource(funcInfo.icon);
menuVO.setPathC(funcInfo.resourceC);
menuVO.setResourceDotNet(funcInfo.resourceDotNet);
menuVO.setResourceMobile(funcInfo.resourceMobile);
@@ -491,7 +492,7 @@
}
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
- functionVO.setSource(menu.image);
+ functionVO.setSource(menu.icon);
// if(StringUtils.isBlank(menu.resourceB) ){
// continue;
// }
--
Gitblit v1.9.3