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

jinpengyong

2023-08-22 c3e8b19537332aa0e5282cae78d3ea9c9189fd4e

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

}