From 6b7f0c0b9d7966e8149fa249a773706abacf681d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com>
Date: Tue, 31 Mar 2026 21:28:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=94=B9=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/logistics/service/impl/StationServiceImpl.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java
index 47b5af6c..92a1109e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java
@@ -102,6 +102,9 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, Station>
         // 合并数据：除wcId和wcName外其他字段相同的记录，wcName用顿号拼接
         List<StationVO> mergedList = mergeStationList(stationList);
 
+        // 更新 total 为合并后的实际记录数
+        page.setTotal(mergedList.size());
+
         return page.setRecords(mergedList);
     }