Merge branch 'feature-task'

wlzboy

2025-10-26 2c86a8bd60deed0dd0e044bad6fb83f75d19a332

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -132,6 +132,7 @@
        ajax.put("permissions", permissions);
        ajax.put("branchCompanyId", branchCompanyId);
        ajax.put("branchCompanyName", branchCompanyName);
        ajax.put("oaUserId", user.getOaUserId());
        return ajax;
    }