Merge branch 'dev-new' into dev-new-rabbitmq

# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

jsowell-pile/src/main/java/com/jsowell/pile/dto/OrderPileOccupyDTO.java

@@ -11,7 +11,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * TODO
+ * 占桩订单DTO
  *
  * @author Lemon
  * @Date 2024/7/15 13:37:04
@@ -47,6 +47,11 @@ public class OrderPileOccupyDTO extends BaseEntity {
      */
     private String stationId;
 
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
     /**
      * 车牌号码
      */

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java

@@ -75,4 +75,28 @@ public class QueryStartChargeDTO {
      * 支付方式(1-余额支付；3-白名单支付；4-微信支付；5-支付宝支付)
      */
     private String payMode;
+
+    /**
+     * 查询页码
+     */
+    @JsonProperty(value = "PageNo")
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    @JsonProperty(value = "PageSize")
+    private Integer pageSize;
+
+    /**
+     * 上次查询时间
+     */
+    @JsonProperty(value = "LastQueryTime")
+    private String lastQueryTime;
+
+    /**
+     * 上次查询结束时间
+     */
+    @JsonProperty(value = "LastQueryEndTime")
+    private String lastQueryEndTime;
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationInfoDTO.java

@@ -70,6 +70,12 @@ public class QueryStationInfoDTO {
     @JsonProperty(value = "StationIDs")
     private List<String> stationIds;
 
+    /**
+     * 更多标志
+     */
+    @JsonProperty(value = "MoreFlag")
+    private Integer moreFlag;
+
 
     private String address;