Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-02 6b82b8a598226a3e0bd2ef57a6f2282bd135d709

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

@@ -104,9 +104,7 @@
        BigDecimal refundAmount = new BigDecimal("0");
        int orderCount = 0;
        for (ChargingBillListVO chargingBillListVO : list) {
            if (chargingBillListVO.getType()==2){
                continue;
            }

            String temp = "";
            String temp1 = "";
            switch (chargingBillListVO.getType()){