From e86ed626de30e3e60ba5e1294b0d134546ac5b4d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 12:06:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderInfo.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderInfo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderInfo.java
index 65d4294..5d6aaed 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderInfo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderInfo.java
@@ -51,9 +51,9 @@
 	@ApiModelProperty("阶段费用明细")
 	private List<TChargingOrderAccountingStrategy> stageCost;
 	@ApiModelProperty("电流电压曲线")
-	private Map<String, Object> currentAndVoltage;
+	private List<Map<String, Object>> currentAndVoltage;
 	@ApiModelProperty("功率曲线")
-	private Map<String, Object> power;
+	private List<Map<String, Object>> power;
 	@ApiModelProperty("是否可申诉(0=否,1=是)")
 	private Integer actionable;
 }

--
Gitblit v1.7.1