Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-22 a8d4353d8e0bd40a10b2c1eb0c437de9780b8c5e

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java

@@ -504,8 +504,8 @@
            TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
            if(null != chargingOrder){
               Long appUserCarId = chargingOrder.getAppUserCarId();
               TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
               if(null != tAppUserCar){
               if(null != appUserCarId){
                  TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
                  gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
               }