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

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

@@ -0,0 +1,19 @@
+package com.jsowell.pile.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 联联平台查询充电状态
+ *
+ * @author JS-ZZA
+ * @date 2023/5/31 15:00
+ */
+@Data
+public class QueryEquipChargeStatusDTO {
+    @JsonProperty(value = "StartChargeSeq")
+    private String StartChargeSeq;
+
+    @JsonProperty(value = "OperatorID")
+    private String OperatorID;
+}

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

@@ -184,7 +184,7 @@
         left join member_basic_info t2 on t1.member_id = t2.member_id
         join pile_station_info t3 on t1.station_id = t3.id
         join order_detail t4 on t4.order_code = t1.order_code
-        join member_transaction_record t5 on t5.order_code = t1.order_code and action_type = 'forward'
+        left join member_transaction_record t5 on t5.order_code = t1.order_code and action_type = 'forward'
         where t1.del_flag = '0'
         <if test="pileSn != null and pileSn != ''">
             and t1.pile_sn =  #{pileSn,jdbcType=VARCHAR}