From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 screen-api/src/main/java/com/moral/api/mapper/HistoryMonthlyMapper.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistoryMonthlyMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistoryMonthlyMapper.java
index 4d498d0..fcd353b 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistoryMonthlyMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistoryMonthlyMapper.java
@@ -1,7 +1,11 @@
 package com.moral.api.mapper;
 
-import com.moral.api.entity.HistoryMonthly;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.entity.HistoryMonthly;
+import com.moral.api.pojo.vo.historyMonthly.HistoryResultVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@
  */
 public interface HistoryMonthlyMapper extends BaseMapper<HistoryMonthly> {
 
+    List<HistoryResultVo> listAll(@Param("type") String type, @Param("macs") List<String> macs, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

--
Gitblit v1.8.0