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

jinpengyong

2023-10-30 addedb6e27a0eff756ff3cabdd7dd2295ade5414

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

@@ -26,8 +26,9 @@

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

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