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

jinpengyong

2023-08-28 a901d8910243b6c15c3ff7722d006e06d87ec6f6

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

}