Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-23 56a4cc005dc961142070e34bd74aef35f8754c6f

 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);

}