Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-22 a8d4353d8e0bd40a10b2c1eb0c437de9780b8c5e

 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);