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

cjl

2023-12-25 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e

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