Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

2026-04-27 14:35:11 +08:00 · 2024-04-19 15:27:58 +08:00
parent 5c552d7a5b 000b824398
commit 4023576495
25 changed files with 171 additions and 106 deletions
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -2712,6 +2712,7 @@
        SELECT
            t1.station_id as stationId,
            t1.merchant_id,
+            t1.third_party_type as thirdPartyType,
            t3.organization_code AS operatorId,
            t1.pile_connector_code AS connectorId,
            t1.order_code AS startChargeSeq,