From c095cf1ef192a1ac4cfd1868bdf70de2b340a2f5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 18 四月 2026 15:51:40 +0800
Subject: [PATCH] resolve conflict
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/account/UcUserInfo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/account/UcUserInfo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/account/UcUserInfo.java
index bcb0549..665656f 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/account/UcUserInfo.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/account/UcUserInfo.java
@@ -12,13 +12,13 @@
private String appId;
private String headImg;
private Long id;
- private String mobile;
- private String nickName;
+ private String mobile;//用户手机号
+ private String nickName;//用户名称
private List<String> orderList;
private Integer orderType;
private Integer state;
private Integer type;
- private Long uid;
+ private Long uid; //用户id
private List<String> bindCars; // 空时为 null
private Integer musicVip; // 0-非音频会员，1-音频会员
}
--
Gitblit v1.7.1