Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-08-02 ee2d9a4049baa9ecc3f43d0576fd3745688171be

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

@@ -5,6 +5,7 @@

import com.moral.api.entity.HistorySecondCruiser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserListDTO;

/**
 * <p>
@@ -18,6 +19,8 @@

    List<Map<String,Object>> getCruiserData(Map<String,Object> params);

    List<HistorySecondCruiserListDTO> getCruiserDataNewAvg(Map<String,Object> params);

    List<String> getDates(Map<String,Object> params);


@@ -25,4 +28,7 @@

    List<Double> getDust(String start,String end,String mac);


    List<Map<String,Object>> getAllCruiserData(Map<String,Object> params);

}