From f51be3cd3f96e4f8875fad0d6bb13d9ebcca9f93 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 21 三月 2025 14:58:42 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/Andy-Yin/zhitan-ems
---
zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 08eac67..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;
@@ -32,7 +31,7 @@
@ApiModelProperty(value = "鏃堕棿绫诲瀷缂栫爜")
private String timeCode;
@ApiModelProperty(value = "鏃堕棿绫诲瀷")
- private TimeType timeType;
+ private String timeType;
@ApiModelProperty(value = "鍊�")
private Double value;
@ApiModelProperty(value = "璐ㄩ噺")
@@ -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