Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-31 d1d7df6417a76d481e654c96b2db34e4fbab88ea

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

@@ -277,4 +277,6 @@
    * @return
    */
   List<TChargingOrder> getChargingOrder(TChargingOrderVo order);

    Long countCar(List<String> brands);
}