From 5b64f31f1d35b38b51935b5fa7f4b8cf46fbf4cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 08 五月 2025 14:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/SupEquipmentPowerInfo.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/SupEquipmentPowerInfo.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/SupEquipmentPowerInfo.java
index 9df1b09..43ee464 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/SupEquipmentPowerInfo.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/SupEquipmentPowerInfo.java
@@ -23,7 +23,6 @@
     @JsonProperty("EquipRealTimePower")
 
     private BigDecimal EquipRealTimePower;
-    @JsonProperty("DataTime")
-
+    @JsonProperty("ConnectorPowerInfos")
     private List<SupConnectorPowerInfo> ConnectorPowerInfos;
 }

--
Gitblit v1.7.1