Merge remote-tracking branch 'origin/master'

This commit is contained in:
2025-08-19 14:26:34 +08:00

View File

@@ -84,6 +84,7 @@ public class UserController {
vo.setRoles(userInfo.getRoles()); vo.setRoles(userInfo.getRoles());
vo.setPermissions(userInfo.getPermissions()); vo.setPermissions(userInfo.getPermissions());
vo.setOrg(userInfo.getOrg()); vo.setOrg(userInfo.getOrg());
user.setOrgName(userInfo.getOrg().getName());
return R.ok(vo); return R.ok(vo);
} }