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

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

@@ -194,6 +194,30 @@ public class OrderListVO {
     @Excel(name = "服务费")
     private BigDecimal totalServiceAmount;
 
+    /**
+     * 尖时段用电量
+     */
+    @Excel(name = "尖时段用电量")
+    private BigDecimal sharpElectricity;
+
+    /**
+     * 峰时段用电量
+     */
+    @Excel(name = "峰时段用电量")
+    private BigDecimal peakElectricity;
+
+    /**
+     * 平时段用电量
+     */
+    @Excel(name = "平时段用电量")
+    private BigDecimal flatElectricity;
+
+    /**
+     * 谷时段用电量
+     */
+    @Excel(name = "谷时段用电量")
+    private BigDecimal valleyElectricity;
+
     /**
      * 虚拟金额
      */