From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java
index 71a9a25..54c5c4e 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoEnergy.java
@@ -19,8 +19,8 @@
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
- private double ep;
- private double eq;
+ private double startEs;
+ private double endEs;
private double es;
}
--
Gitblit v1.9.3