From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
index b13c340..042f18f 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java
@@ -1,6 +1,7 @@
package com.moral.api.service;
import com.moral.api.entity.HistoryHourly;
+import com.moral.api.vo.HistoryHourlyVo;
import java.util.Date;
import java.util.List;
@@ -123,5 +124,5 @@
Double calculatedValue(List<HistoryHourly> list, String sensorCode, String type, Double lower, Double upper);
- boolean historyHourly();
+ boolean historyHourly(HistoryHourlyVo historyHourlyVo);
}
--
Gitblit v1.8.0