Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-12-18 6c8497f63227d1ebc2c860c5b3de4d9f68aaf841

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java

@@ -164,6 +164,6 @@
     */
    private boolean hasPermissions(Set<String> permissions, String permission)
    {
        return permissions.contains(ALL_PERMISSION) || permissions.equals(StringUtils.trim(permission));
        return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
    }
}