From cf7424ad3ffcb4720f93175ccbaa60c7c0b24c6c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 28 二月 2026 23:32:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/account/XpOperationsUserWithRoleVO.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/account/XpOperationsUserWithRoleVO.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/account/XpOperationsUserWithRoleVO.java
index 387bfea..edfce97 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/account/XpOperationsUserWithRoleVO.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/account/XpOperationsUserWithRoleVO.java
@@ -1,10 +1,13 @@
package com.xiaopeng.api.vo.account;
+import com.xiaopeng.api.model.account.SysRole;
import com.xiaopeng.api.model.account.XpOperationsUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.util.List;
/**
* 运维人员及角色信息视图对象
@@ -16,9 +19,6 @@
@ApiModel("运维人员及角色信息视图对象")
public class XpOperationsUserWithRoleVO extends XpOperationsUser {
- @ApiModelProperty(value = "角色id")
- private Long roleId;
-
- @ApiModelProperty(value = "角色名称")
- private String roleName;
+ @ApiModelProperty(value = "关联角色")
+ private List<SysRole> roles;
}
--
Gitblit v1.7.1