Merge remote-tracking branch 'origin/master'

 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.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;
//            }

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java

@@ -1245,7 +1245,7 @@
            //info.suffixB = object.getSuffixB() == null ? "" : object.getSuffixB();
            info.desc = object.getRemark() == null ? "" : object.getRemark();
            info.seq = object.getSort();
            info.image = object.getSource() == null ? "" : object.getSource();
            info.icon = object.getSource() == null ? "" : object.getSource();
            info.isValid = object.getIsValid();
            info.aliasName = object.getAlias() == null ? "" : object.getAlias();
            info.resourceDotNet = object.getResourceDotNet() == null ? "" : object.getResourceDotNet();
@@ -1312,7 +1312,7 @@
            /*obj.suffixC = "";
            obj.suffixB = "";*/
            obj.seq = sequence;
            obj.image = menuVO.getSource();
            obj.icon = menuVO.getSource();
            obj.isValid = Func.isNotEmpty(menuVO.getValid()) ? menuVO.getValid():false;
            obj.aliasName = aliasName;
            obj.resourceDotNet = resDotNet;