From 60ebe311e7e8bec2aca4d46ce1a8018ff871446b Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 20 五月 2025 10:36:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerDemandDTO.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerDemandDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerDemandDTO.java
index cc6286e..9761c2a 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerDemandDTO.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerDemandDTO.java
@@ -1,10 +1,12 @@
package com.iailab.module.ansteel.api.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.Date;
/**
* @author dyk
@@ -25,14 +27,18 @@
private String code;
@Schema(description = "月最大需量")
- private String maxDemand;
+ private BigDecimal maxDemand;
@Schema(description = "实测需量")
- private String curDemand;
+ private BigDecimal curDemand;
@Schema(description = "有功功率")
- private String activePower;
+ private BigDecimal activePower;
@Schema(description = "排序")
private Integer sort;
+
+ @Schema(description = "发生时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date occurTime;
}
--
Gitblit v1.9.3