Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.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/resources/mapper/pile/OrderBasicInfoMapper.xml

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OccupyOrderVO.java

@@ -1,5 +1,6 @@
 package com.jsowell.pile.vo.web;
 
+import com.jsowell.common.annotation.Excel;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -13,16 +14,36 @@ import java.math.BigDecimal;
 @Data
 public class OccupyOrderVO {
     private String id;
+    @Excel(name = "占桩订单号")
     private String occupyCode;
+
     private String status;
+
+    @Excel(name = "会员ID")
     private String memberId;
+
     private String stationId;
+
     private String plateNumber;
+
+    @Excel(name = "站点名称")
     private String stationName;
+
+    @Excel(name = "占桩开始时间")
     private String startTime;
+
+    @Excel(name = "占桩结束时间")
     private String endTime;
+
+    @Excel(name = "支付状态")
     private String payStatus;
+
+    @Excel(name = "订单金额")
     private BigDecimal orderAmount;
+
+    @Excel(name = "充电桩编号")
     private String pileSn;
+
+    @Excel(name = "充电桩枪口号")
     private String connectorCode;
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderMonthStatVO.java

@@ -0,0 +1,11 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+public class OrderMonthStatVO {
+    private String month;
+    private Integer orderCount;
+    private BigDecimal insuranceAmount;
+}