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/OrderPileOccupyService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderPileOccupyVO.java

@@ -0,0 +1,53 @@
+package com.jsowell.pile.vo.uniapp;
+
+import lombok.Data;
+
+/**
+ * 占桩订单列表VO
+ *
+ * @author Lemon
+ * @Date 2023/8/18 9:34
+ */
+@Data
+public class OrderPileOccupyVO {
+    /**
+     * 占桩订单编号
+     */
+    private String occupyCode;
+
+    /**
+     * 状态（0-占桩中；1-订单完成; 2-订单挂起）
+     */
+    private String status;
+
+    /**
+     * 站点id
+     */
+    private String stationId;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
+    /**
+     * 占桩开始时间
+     */
+    private String startTime;
+
+    /**
+     * 占桩结束时间
+     */
+    private String endTime;
+
+    /**
+     * 支付状态（0-未支付；1-支付完成；2-无需支付）
+     */
+    private String payStatus;
+
+    /**
+     * 占桩订单金额
+     */
+    private String orderAmount;
+
+}