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

cjl

2023-09-06 d50faa74719f4d3f18ec9f99d99483f2c119c3a0

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