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

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

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

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

    void createTable(String timeUnits);

    List<Map<String, Object>> getHistoryFiveMinutelyData(Map<String,Object> params);
    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);
}