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

jinpengyong

2023-08-22 e6f974ca6eab798c2df5c09cdb8320ecf4ff4185

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

}