From d2230c638cc57b7dc4fa4570e79cbc93107926b0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 15:44:38 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index eb8826a..b5f7dd1 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/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());
--
Gitblit v1.7.1