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

jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java

@@ -153,10 +153,10 @@ public interface IOrderBasicInfoService {
 
 	/**
 	 * 获取充电实时数据
-	 * @param orderCode 订单编号
+	 * @param transactionCode 交易流水号
 	 * @return
 	 */
-	List<RealTimeMonitorData> getChargingRealTimeData(String orderCode);
+	List<RealTimeMonitorData> getChargingRealTimeData(String transactionCode);
 
 	/**
 	 * 首页订单数据展示

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java

@@ -113,6 +113,7 @@ public class ThirdPartySettingInfoServiceImpl implements IThirdPartySettingInfoS
             return insertThirdPartySettingInfo(info);
         }else {
             // 修改
+            info.setId(infoByStationId.getId());
             return updateThirdPartySettingInfo(info);
         }
     }