Merge branch 'feature-business-minigram' into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConnectorInfoVO.java

@@ -66,4 +66,11 @@ public class ConnectorInfoVO {
      */
     private String ratedVoltage;
 
+    private String orderCode;
+
+    private String chargeDegree;
+
+    private String chargeTime;
+
+    private String timeRemaining;
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/BusinessOrderDetailInfoVO.java

@@ -25,6 +25,11 @@ public class BusinessOrderDetailInfoVO {
 
     private String pileConnectorCode;
 
+    /**
+     * 交易流水号
+     */
+    private String transactionCode;
+
     /**
      * 充电次数
      */
@@ -185,4 +190,9 @@ public class BusinessOrderDetailInfoVO {
      */
     private String memberId;
 
+    /**
+     * 剩余时间
+     */
+    private String timeRemaining;
+
 }