Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 zhang-content/src/main/java/com/ruoyi/service/impl/ShareACollectionServiceImpl.java

@@ -136,4 +136,4 @@
        Map<Long,List<Long>> menuAconId = getByUserId(userId).stream().collect(Collectors.groupingBy(ZfShare::getSysMenuId,Collectors.mapping(ZfShare::getShareContent,Collectors.toList())));
        return AjaxResult.success(all(menuAconId));
    }
}
}