From e125b445697a6b8c2b5cc5c57f31249c5088c1c9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 26 Jan 2018 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/HistoryMapper.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 8fecdda..2247950 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -3,9 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
 public interface HistoryMapper{
 
 	Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);

--
Gitblit v1.8.0