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/OrderBasicInfo.java

@@ -79,6 +79,12 @@ public class OrderBasicInfo extends BaseEntity {
 	@Excel(name = "充电桩枪口编号")
 	private String pileConnectorCode;
 
+	/**
+	 * 逻辑卡号
+	 */
+	@Excel(name = "逻辑卡号")
+	private String logicCard;
+
 	/**
 	 * 启动方式
 	 * 0-后管启动；1-用户app启动

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

@@ -63,6 +63,7 @@ public class OrderDetailInfoVO {
 		private String transactionCode; // 交易流水号
 		private String orderStatus; // 订单状态
 		private String orderStatusDescribe; // 订单状态描述
+		private String logicCard; // 卡号
 		private String startTime; // 充电开始时间
 		private String endTime; // 充电结束时间
 		private String stopReasonMsg; // 停止原因

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

@@ -90,6 +90,12 @@ public class OrderListVO {
     @Excel(name = "充电桩枪口编号")
     private String pileConnectorCode;
 
+    /**
+     * 逻辑卡号
+     */
+    @Excel(name = "逻辑卡号")
+    private String logicCard;
+
     /**
      * 启动方式（0-后管启动；1-用户app启动）
      */

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

@@ -13,6 +13,7 @@
         <result property="pileSn" column="pile_sn"/>
         <result property="connectorCode" column="connector_code"/>
         <result property="pileConnectorCode" column="pile_connector_code"/>
+        <result property="logicCard" column="logic_card"/>
         <result property="startMode" column="start_mode"/>
         <result property="payMode" column="pay_mode"/>
         <result property="payStatus" column="pay_status"/>
@@ -90,6 +91,7 @@
         pile_sn,
         connector_code,
         pile_connector_code,
+        logic_card,
         start_mode,
         pay_mode,
         pay_status,
@@ -159,6 +161,7 @@
             t3.station_name as stationName,
             t1.pile_sn as pileSn,
             t1.connector_code as connectorCode,
+            t1.logic_card as logicCard,
             t1.start_mode as startMode,
             t1.pay_mode as payMode,
             t1.pay_status as payStatus,