Merge branch 'wb' into qa

cjl

2023-09-27 f0a5a28345ed6764ac033a585f1e6b7cbcf8d102

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

@@ -28,6 +28,7 @@

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