From a9cc2343ceaad3e99dc25eb036dc99aeded279a6 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 20 Oct 2023 09:26:36 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb --- 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