Merge branch 'dev' into dev-g

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

@@ -16,4 +16,7 @@ public class QueryEquipChargeStatusDTO {
 
     @JsonProperty(value = "OperatorID")
     private String OperatorID;
+
+    @JsonProperty(value = "orderNo")
+    private String orderNo;
 }

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

@@ -99,4 +99,10 @@ public class QueryStartChargeDTO {
      */
     @JsonProperty(value = "LastQueryEndTime")
     private String lastQueryEndTime;
+
+    /**
+     * 充电订单号 格式“运营商ID+唯一编号”
+     */
+    @JsonProperty(value = "OrderNO")
+    private String orderNO;
 }

jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/dto/ConnectorInfoDTO.java

@@ -167,4 +167,17 @@ public class ConnectorInfoDTO {
     @JSONField(name = "OpreateHours")
     private String opreateHours;
 
+
+    /**
+     * 有无地锁
+     */
+    @JSONField(name = "HasLock")
+    private Integer hasLock;
+
+    /**
+     * 充电二维码
+     */
+    @JSONField(name = "ChargingQrCode")
+    private String chargingQrCode;
+
 }