Merge remote-tracking branch 'origin/master'

xuhy

2024-10-26 d88cb5d22966936d95f7ddb15345b45729317a50

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java

@@ -114,7 +114,7 @@
                tChargingOrderExport.setCity(data.get(0).getCity());
                tChargingOrderExport.setCityName(data.get(0).getDistricts());
                tChargingOrderExport.setSiteType(data.get(0).getSiteType());

                tChargingOrderExport.setStatus(data.get(0).getStatus()+"");
                Partner data2 = siteClient.getPartnerR(data.get(0).getPartnerId()).getData();
                if (data2!=null){
                    tChargingOrderExport.setPartner(data2.getName());