From 41660a11fb793295d44a4d47949284105e429395 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:56:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl-230812

---
 screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
index ce88532..3cf3d71 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
@@ -2,8 +2,6 @@
 
 import java.util.Map;
 
-import com.moral.api.entity.HistoryHourly;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>

--
Gitblit v1.8.0