From fdf8c19224d67e94a4404388359db4b4ee348a5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 23:55:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/XpPointService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/XpPointService.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/XpPointService.java
index dd3deb2..7591b60 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/XpPointService.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/XpPointService.java
@@ -16,7 +16,7 @@
 import com.xiaopeng.map.dto.NearestDto;
 import com.xiaopeng.map.dto.StationDetailQueryDto;
 import com.xiaopeng.map.query.PointByNameQuery;
-import com.xiaopeng.map.vo.FenceAndStationVo;
+import com.xiaopeng.api.query.operation.FenceAndStationVo;
 import com.xiaopeng.map.vo.NearestVo;
 import com.xiaopeng.map.vo.OrderDistanceVo;
 import com.xiaopeng.map.vo.StationDetailVo;
@@ -74,7 +74,7 @@
     boolean getInTime(LocalTime now,  Integer effectivePeriod, String effectiveTimePeriod);
     List<XpPoint> pointMap(PointMapQuery query);
 
-    List<FenceAndStationVo> findListFenceAndStation();
+    List<FenceAndStationVo> findListFenceAndStation(String cityCode);
 
     List<XpPoint> findList(PointListQuery query);
 

--
Gitblit v1.7.1