From e6f974ca6eab798c2df5c09cdb8320ecf4ff4185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:52:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21

---
 screen-api/src/main/java/com/moral/api/service/MonitorPointService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java b/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
index 9dd3484..69bfe79 100644
--- a/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
+++ b/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
@@ -1,6 +1,6 @@
 package com.moral.api.service;
 
-import com.alibaba.fastjson.JSONObject;
+import com.moral.api.dto.MonitoringStationDTO;
 import com.moral.api.entity.MonitorPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.moral.api.pojo.form.device.MonitorPointQueryForm;
@@ -52,6 +52,7 @@
      */
     List<Map<String, Object>> getHourlyDataDataV3Excel(Map<String, Object> params);
 
+    List<MonitoringStationDTO> listMonitoringStationDTO(Map<String, Object> params, int reportType, String startTime, String endTime);
 
 }
 

--
Gitblit v1.8.0