Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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