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

jsowell-pile/src/main/java/com/jsowell/pile/domain/nanrui/NROrderInfo.java

@@ -111,4 +111,6 @@ public class NROrderInfo {
      */
     @JSONField(name = "MeterValueEnd")
     private BigDecimal meterValueEnd;
+
+    private String thirdPartyType;
 }

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

@@ -0,0 +1,19 @@
+package com.jsowell.pile.dto;
+
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author Lemon
+ * @Date 2024/4/19 14:38:48
+ */
+@Data
+public class PushRealTimeInfoDTO {
+
+    private String pileConnectorCode;
+
+    private String status;
+
+    private String thirdPartyType;
+}

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -2712,6 +2712,7 @@
         SELECT
             t1.station_id as stationId,
             t1.merchant_id,
+            t1.third_party_type as thirdPartyType,
             t3.organization_code AS operatorId,
             t1.pile_connector_code AS connectorId,
             t1.order_code AS startChargeSeq,