Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-10-27 509c208bab15c3b125b5e3f8e6df141fb1d85acb

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

}