Merge remote-tracking branch 'origin/dev' into dev

chen_xi

2022-11-17 8e41bd549e3bf0dab2f713ad1c967c4e673c0e5a

 screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java

@@ -1,7 +1,11 @@
package com.moral.api.mapper;

import com.moral.api.entity.HistoryHourly;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.entity.HistoryHourly;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -13,4 +17,8 @@
 */
public interface HistoryHourlyMapper extends BaseMapper<HistoryHourly> {

    String selectHourlyData(Map<String,Object> params);

    List<Map<String,Object>> selectDataByMacsAndTime(@Param("timeUnits") String timeUnits, @Param("list")List list, @Param("time")String time);

}