From b79c0fa3aa4f7dffe18ab419b6cf4ed47ebd22f9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 27 八月 2024 17:33:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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