From 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 25 Dec 2023 14:17:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/HeatMapDTO.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/HeatMapDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/HeatMapDTO.java
index 632f91f..830e6ac 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/HeatMapDTO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/HeatMapDTO.java
@@ -43,14 +43,19 @@
private String name;
- public Double getCount(){
- Double count = this.count;
- if (ObjectUtils.isEmpty(count)){
- count= 0.0;
- return count;
- }
- return count;
- }
+ private Integer groupId;
+
+
+// private Double sum;
+
+// public Double getCount(){
+// Double count = this.count;
+// if (ObjectUtils.isEmpty(count)){
+// count= 0.0;
+// return count;
+// }
+// return count;
+// }
}
--
Gitblit v1.8.0