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

# Conflicts: # jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
2026-04-26 05:55:03 +08:00 · 2023-08-25 17:23:35 +08:00
parent 8cf8d39a9e 543a23e597
commit cb3cd4f5c6
5 changed files with 278 additions and 121 deletions
--- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
@@ -302,6 +302,7 @@
        SELECT
            t1.id as id,
            t1.dept_id as deptId,
+            t1.parking_id as parkingId,
            t1.station_name as stationName,
            count(t2.id) as pileNum,
            t1.area_code as areaCode,