Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

昨天 ba957b5a448708294dead72c3c3b6f8932cc3f76

 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