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

云

9 天以前 39e6d6469b652daaf4af66b8b75f8dad2f95923c

 src/main/java/com/ruoyi/framework/security/LoginUser.java

@@ -301,7 +301,10 @@
    public void setUser(SysUser user)
    {
        this.user = user;
        this.aiEnabled = user == null ? null : user.getAiEnabled();
        if (user != null && user.getAiEnabled() != null)
        {
            this.aiEnabled = user.getAiEnabled();
        }
    }


    @Override