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

Pu Zhibing

2025-02-12 697582a7e65e6110a22dad7bc8241d25fe3ecc51

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java

@@ -455,6 +455,8 @@
                        settlementExportVO.setVehicleBrand(data5.get(0).getVehicleBrand());
                    }

                }else{
                    settlementExportVO.setLicensePlate(chargingOrder.getPlateNum());
                }
                settlementExportVO.setSiteCode(data3.get(0).getCode());
                settlementExportVO.setSiteName(data3.get(0).getName());