From 3058865fa4dfa634a92b4ebd826d8b1264dc90a3 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 05 三月 2025 15:04:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ElectricityPriceSegmentedDTO.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ElectricityPriceSegmentedDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ElectricityPriceSegmentedDTO.java
index da6f951..db4718a 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ElectricityPriceSegmentedDTO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ElectricityPriceSegmentedDTO.java
@@ -3,7 +3,6 @@
import lombok.Data;
import java.io.Serializable;
-import java.sql.Time;
import java.util.Date;
/**
@@ -19,35 +18,31 @@
*/
private String id;
- /**
- * 能介名称
- */
- private String nengjieName;
+ private String iTimeId;
+
+ private String recId;
/**
- * 参考总量能介
+ * 能介编号
*/
- private String cankaozongliangnengjie;
+ private String mediaId;
- /**
- * 价格
- */
- private String price;
-
- /**
- * 价格
- */
- private String month;
+ private String refMediaId;
/**
* 开始时间
*/
- private Time timeStart;
+ private Date startTime;
/**
* 结束时间
*/
- private Time timeEnd;
+ private Date endTime;
+
+ /**
+ * 年份
+ */
+ private String year;
/**
* 创建时间
--
Gitblit v1.9.3