Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-01 2d47f5ac48f6ee7eb0194ffb5b65ed12b3b64437

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

@@ -518,7 +518,7 @@
         if(status == 5 || status == 6){
            gunMonitoring.setStatus(3);
         }
         if(status == 4){
         if(status == 4 || status == 7){
            Integer id = gunMonitoring.getId();
            TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
            if(null != chargingOrder){