Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 48570adc584224ea2ebafc90a58beb76e85dd4be

 src/main/java/com/moral/mapper/HistoryMinutelyMapper.java

File was renamed from src/main/java/com/moral/mapper/DataMapper.java
@@ -3,7 +3,7 @@
import java.util.List;

import java.util.Map;



public interface DataMapper{

public interface HistoryMinutelyMapper{



   Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);