Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

昨天 2cf783a1480050c0f13907c5fde625edee8fce62

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

@@ -52,7 +52,11 @@

    public static SysUser getSysUser()
    {
        return getLoginUser().getSysUser();
//        return getLoginUser().getSysUser();
        SysUser sysUser = new SysUser();

        sysUser.setUserId(Long.valueOf(SecurityContextHolder.get("user_id")));
        return sysUser;
    }

    /**