From 90803807ab2eb545f9857f3936d4cdf564f39a1d Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 9 Dec 2025 10:27:03 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=20=E6=9B=B4=E6=96=B0=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E4=BA=92=E8=81=94=E4=BA=92=E9=80=9A=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/vo/base/ThirdPartyStationInfoVO.java    | 5 +++++
 .../src/main/resources/mapper/pile/PileStationInfoMapper.xml | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationInfoVO.java
index 84c54a956..a67ff568b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationInfoVO.java
@@ -15,4 +15,9 @@ public class ThirdPartyStationInfoVO extends PileStationInfo {
     private String merchantName;
 
     private String organizationCode;
+
+    /**
+     * 设备所属商户ID（在后管页面可配置）
+     */
+    private String equipmentOwnerId;
 }
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
index c7acf4fdc..7193d8f7c 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
@@ -591,7 +591,8 @@
         t1.create_time AS createTime,
         t1.update_by AS updateBy,
         t1.update_time AS updateTime,
-        t1.del_flag AS delFlag
+        t1.del_flag AS delFlag,
+        t3.equipment_owner_id AS equipmentOwnerId
         FROM
         pile_station_info t1
         JOIN pile_merchant_info t2 ON t1.merchant_id = t2.id