From 567a3b404987c8c4919e31292d300e9517cb5987 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 29 四月 2025 14:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetDropdownDTO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 75%
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 a62b7f0..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 = "节点编码")
@@ -23,7 +24,9 @@
private String nodeName;
@Schema(description = "当前功率因数")
- private String curCos;
+ private BigDecimal curCos;
+ @Schema(description = "数据时间")
+ private Date dataTime;
}
\ No newline at end of file
--
Gitblit v1.9.3