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

jinpengyong

2023-10-13 bb6856a82a588f05040b0410a9747ae8029bb3be

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

@@ -26,6 +26,10 @@

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

}