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

jsowell-pile/src/main/java/com/jsowell/pile/dto/lutongyunting/BindCouponDTO.java

@@ -1,6 +1,9 @@
 package com.jsowell.pile.dto.lutongyunting;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 给指定车辆绑定优惠券
@@ -9,6 +12,9 @@ import lombok.Data;
  * @Date 2023/8/23 14:15
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class BindCouponDTO {
     private String appId;
 

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,