Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-22 1110455c307fa0a01848a313f0002a66306cdc8c

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

@@ -501,12 +501,11 @@
         }
         if(status == 4){
            Integer id = gunMonitoring.getId();
            //根据订单数据查询车牌号
            TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
            if(null != chargingOrder){
               Long appUserCarId = chargingOrder.getAppUserCarId();
               if(null != appUserCarId){
                  TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
               if(null != tAppUserCar){
                  gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
               }