From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java b/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java
index e5127f0..65e01e4 100644
--- a/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java
+++ b/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java
@@ -1,7 +1,6 @@
package com.zhitan.realtimedata.domain;
import com.zhitan.common.enums.Quality;
-import com.zhitan.common.enums.TimeType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -17,8 +16,8 @@
@ApiModelProperty(value = "鎸囨爣id")
private String indexId;
- @ApiModelProperty(value = "鎸囨爣搴搃d")
- private String indexStorageId;
+ @ApiModelProperty(value = "鑳芥簮鍝佺")
+ private String energyType;
@ApiModelProperty(value = "鎸囨爣code")
private String indexCode;
@ApiModelProperty(value = "鎸囨爣鍚嶇О")
@@ -32,7 +31,7 @@
@ApiModelProperty(value = "鏃堕棿绫诲瀷缂栫爜")
private String timeCode;
@ApiModelProperty(value = "鏃堕棿绫诲瀷")
- private TimeType timeType;
+ private String timeType;
@ApiModelProperty(value = "鍊�")
private Double value;
@ApiModelProperty(value = "璐ㄩ噺")
@@ -54,12 +53,12 @@
this.indexId = indexId;
}
- public String getIndexStorageId() {
- return indexStorageId;
+ public String getEnergyType() {
+ return energyType;
}
- public void setIndexStorageId(String indexStorageId) {
- this.indexStorageId = indexStorageId;
+ public void setEnergyType(String energyType) {
+ this.energyType = energyType;
}
public String getIndexCode() {
@@ -110,11 +109,11 @@
this.timeCode = timeCode;
}
- public TimeType getTimeType() {
+ public String getTimeType() {
return timeType;
}
- public void setTimeType(TimeType timeType) {
+ public void setTimeType(String timeType) {
this.timeType = timeType;
}
--
Gitblit v1.9.3