From 861e77328ed3a09c4d21706d201b380c8e8ea1a1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 九月 2026 09:02:54 +0800
Subject: [PATCH] Merge branch '2.3' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.3

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/udan/model/UdanEmsDeviceState.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/udan/model/UdanEmsDeviceState.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/udan/model/UdanEmsDeviceState.java
index 25b3996..a0e30f8 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/udan/model/UdanEmsDeviceState.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/udan/model/UdanEmsDeviceState.java
@@ -3,6 +3,7 @@
 import com.ruoyi.other.emind.dto.EmindIncomeHistoryDto;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -14,10 +15,10 @@
 
 /** iems-open-v1.0.5.proto 中 IEmsAllDeviceState 对应的业务对象。 */
 @Data
-public class UdanEmsDeviceState {
+public class UdanEmsDeviceState implements Serializable {
     private String emsSystemId;
     private long time;
-    private String emsDeviceId;
+    private String emsDeviceId; // 这个为电站里面填写的设备ID
     private EmsState emsState;
     private PowerMeterState powerMeterState;
 

--
Gitblit v1.7.1