Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

6 天以前 d14764d097691d35e7015c2d161c612aa7642a8e

 src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -121,7 +121,7 @@
     */

    public static boolean isAdmin(Long userId)

    {

        return userId != null && 1L == userId;

        return hasRole("普通2") ||hasRole("admin") || hasRole("最高1");

    }



    /**