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/model/operation/XpWhitelist.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpWhitelist.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpWhitelist.java
index e16ab1d..a931556 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpWhitelist.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpWhitelist.java
@@ -60,9 +60,15 @@
@Max(value = 99999, message = "最大不能超过99999")
private Integer maxOrderNum;
+ @ApiModelProperty(value = "用户id 根据手机号获取")
+ private Long appUserId;
+
public Boolean getStatus() {
- if (LocalDate.now().isAfter(expireTime)) {
- return false;
+ if(expireTime!= null){
+ if (LocalDate.now().isAfter(expireTime)) {
+ return false;
+ }
+ return status;
}
return status;
}
--
Gitblit v1.7.1