Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-17 98f1d329436e64a03a1c9f09a3e17fc0223ee28d

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/UploadRealTimeMonitoringDataClient.java

@@ -24,7 +24,7 @@
    * @return
    */
   @PostMapping("/uploadRealTimeMonitoringData/getOrderInfoByCode")
   R<UploadRealTimeMonitoringData> chargingOrderInfo(String orderId);
   R<UploadRealTimeMonitoringData> chargingOrderInfo(@RequestParam("orderId") String orderId);

   /**
    * 批量查询