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

jsowell-pile/src/main/java/com/jsowell/pile/vo/PileReservationInfoVO.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @Builder
-public class PileReservedVO {
+public class PileReservationInfoVO {
     private String reservedId;
 
     /**
@@ -15,6 +15,11 @@ public class PileReservedVO {
      */
     private String pileSn;
 
+    /**
+     * 充电桩枪口编号
+     */
+    private String pileConnectorCode;
+
     /**
      * 预约开始时间
      */
@@ -28,11 +33,16 @@ public class PileReservedVO {
     /**
      * 周期性预约的频率，对于单次预约，该字段可以为 NULL。可能的值包括 daily, weekly, monthly
      */
-    private String freq;
+    // private String freq;
 
     /**
      * 状态（0-未生效；1-生效）
      */
     private String status;
 
+    /**
+     * 验证身份(1-是; 0-否)
+     */
+    private String verifyIdentity;
+
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonPileRealTimeVO.java

@@ -45,4 +45,14 @@ public class PersonPileRealTimeVO {
      * 实时功率
      */
     private String instantPower;
+
+    /**
+     * 枪口状态
+     */
+    private String status;
+
+    /**
+     * soc
+     */
+    private String soc;
 }