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

maven

昨天 d9ff3817f056ad245a16bd394133a407d6c6b9cf

 src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java

@@ -71,7 +71,7 @@
                // 查询租户

                Long teantId = deptMapper.maxLevelDeptId(factoryId);

                user.setCurrentDeptId(factoryId);

                user.setTenantId(teantId.intValue());

                user.setTenantId(teantId);

            }

        }

        // 获取用户当前登录部门，并查询租户id