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

jinpengyong

2023-07-31 2b5e23042827c66c936d6aeaa004f42b95236d52

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

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

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


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

}