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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

 screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.historyFiveMinutely.DeviceAndFiveMinuteDataDTO;
import com.moral.api.pojo.form.historyFiveMinutely.QueryDeviceAndFiveMinuteDataForm;
import com.moral.api.pojo.vo.historyFiveMinutely.QueryFiveDataByMacVO;

import java.util.Date;
import java.util.List;
@@ -49,4 +50,7 @@
            */
    Map<String,Object> getPopDataByMac(Map<String, Object> params);


   QueryFiveDataByMacVO queryFiveDataByMac(String name,String chooseTime,String time);

}