From d1b1e3179557554302782ce0af580ff6a6679953 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 28 二月 2026 09:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
index 2cc0efa..77532e8 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
@@ -176,6 +176,8 @@
             xpHistoryStartPointsVo.setId(xpPoint.getId());
             double distanced = FastDistanceCalculator.distanceFastKm(historyStartPointsDto.getLat(), historyStartPointsDto.getLon(), xpPoint.getPointLat(), xpPoint.getPointLon());
             xpHistoryStartPointsVo.setDistance(distanced);
+            xpHistoryStartPointsVo.setTime(xpPoint.getParkingTimeLimit());
+            xpHistoryStartPointsVo.setElectronicAreaId(xpPoint.getElectronicAreaId());
             resultList.add(xpHistoryStartPointsVo);
 
         }
@@ -196,6 +198,8 @@
             xpHistoryEndPointsVo.setId(xpPoint.getId());
             double distanced = FastDistanceCalculator.distanceFastKm(historyEndPointsDto.getLat(), historyEndPointsDto.getLon(), xpPoint.getPointLat(), xpPoint.getPointLon());
             xpHistoryEndPointsVo.setDistance(distanced);
+            xpHistoryEndPointsVo.setTime(xpPoint.getParkingTimeLimit());
+            xpHistoryEndPointsVo.setElectronicAreaId(xpPoint.getElectronicAreaId());
             resultList.add(xpHistoryEndPointsVo);
         }
 

--
Gitblit v1.7.1