Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-22 e87c8ce5fb161888bab7dea9fe410b787d7e98fb

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -1740,6 +1740,7 @@
            chargingGun.setChargingPower(divide);
            chargingGunClient.updateChargingGunById(chargingGun);
         }
         chargingOrder.setChargingCapacity(query.getCharging_degree());
         chargingOrder.setElectricity(query.getCharging_degree());
         chargingOrder.setTotalElectricity(new BigDecimal(100 - query.getSoc()));
         this.updateById(chargingOrder);