Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-11 3aa5acc2aff683ead0e2ca585a604f547b68dbf6

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