From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 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