From 9c9e6a5e192e38ed45497baab2ce4b7b9a216985 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 11:29:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetDropdownDTO.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDropdownDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetDropdownDTO.java
similarity index 68%
rename from ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDropdownDTO.java
rename to ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetDropdownDTO.java
index 61855c9..cbda4e1 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorDropdownDTO.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetDropdownDTO.java
@@ -5,6 +5,7 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 电力功率因数电网拓扑下拉列表
@@ -13,7 +14,7 @@
  * @since 1.0.0 2025-04-11
  */
 @Data
-public class PowerNetFactorDropdownDTO implements Serializable {
+public class PowerNetDropdownDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Schema(description = "节点编码")
@@ -22,4 +23,10 @@
     @Schema(description = "节点名称")
     private String nodeName;
 
+    @Schema(description = "当前功率因数")
+    private BigDecimal curCos;
+
+    @Schema(description = "数据时间")
+    private Date dataTime;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3