Merge remote-tracking branch 'origin/dev' into dev

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -807,6 +807,7 @@ public class OrderService {
         // 如果订单的交易记录为空
         if (data == null) {
             data = new TransactionRecordsData();
+            // TODO 以前端传的值为准，如果没有传值则查最后一次实时数据
             if (StringUtils.equals(chargingAmount, Constants.ZERO) || StringUtils.equals(chargingDegree, Constants.ZERO)) {
                 // 获取最后一次实时数据
                 List<RealTimeMonitorData> chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode());