Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-05 44f81d63412eac4e3442cf6005ea18b22ee2175b

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -1280,11 +1280,13 @@
            brands.add(objectMap.get("vehicle_brand").toString());
        }

        if (carBrandMap.size()>=5) {
        Long count = chargingOrderService.countCar(brands);
        Map<String, Object> others = new HashMap<>();
        others.put("vehicle_brand","其他");
        others.put("counts",count);
        carBrandMap.add(others);
        }
        //本地车数量
        Map<String,Object> localCarMap = chargingOrderService.countLocalCar();