From 945c12ccd5b4b72a8a4a5a9153a5901ffe587a10 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 18:49:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GunStatusStatisticsVO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GunStatusStatisticsVO.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GunStatusStatisticsVO.java
index fe534cb..2611653 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GunStatusStatisticsVO.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GunStatusStatisticsVO.java
@@ -10,12 +10,12 @@
@Data
@ApiModel(value = "设备状态统计VO")
-public class GunStatusStatisticsVO implements Serializable {
+public class GunStatusStatisticsVO {
@ApiModelProperty(value = "充电桩类型统计 key:充电模式（1=超级快充，2=快充，3=慢充）")
- private Map<Integer,Integer> modeStatistics;
+ private List<Map<String,Object>> modeStatistics;
@ApiModelProperty(value = "状态统计 key:充电模式（1=离线，2=故障，3=充电中）")
- private Map<Integer,Integer> statusStatistics;
+ private List<Map<String,Integer>> statusStatistics;
@ApiModelProperty(value = "状态统计根据类型分组")
private List<StatusModeStatisticsVO> statusModeStatistics;
}
--
Gitblit v1.7.1