Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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

@@ -1,12 +1,12 @@
package com.moral.mapper;



import com.moral.entity.charts.DataCondition;

import com.moral.entity.charts.TimePeriod;

import java.util.List;

import java.util.Map;



import org.apache.ibatis.annotations.Param;



import java.util.List;

import java.util.Map;

import com.moral.entity.charts.DataCondition;

import com.moral.entity.charts.TimePeriod;



public interface HistoryMinutelyMapper {



@@ -24,4 +24,9 @@


    List<Map<String, Object>> getSensorData(Map<String, Object> parameters);



    List<Map<String, Object>> getSensorData2020(Map<String, Object> parameters);



    List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters);



    List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);

}