From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java
index 0d245e1..04463cb 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java
@@ -2,6 +2,7 @@
import lombok.Data;
+import java.util.List;
import java.util.Map;
/**
@@ -16,6 +17,11 @@
private String sensorCode;
- private Map<String,Double> timeValueMap;
+ private String code;
+
+ /*
+ * map������time���value
+ * */
+ private List<Map<String,Object>> timeValueList;
}
--
Gitblit v1.8.0