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

jinpengyong

2023-10-26 9a156c3e20c9dd5c1215bd5dfec5677388777749

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

@@ -26,7 +26,7 @@

    String  getDaily(Map<String,Object> params);

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

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