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

cjl

2023-10-13 f976feb7ae339c006af150b30802f7edfc8d966f

 screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java

@@ -9,5 +9,7 @@

    List<Map<String, Object>> getHistoryMinutelyData(Map<String, Object> params);

    List<String> getHistoryMinutelyMacData(Map<String, Object> params);

    List<Map<String, Object>> getHourlyData(Map<String, Object> params);
}