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

cjl

2023-09-26 6c2fe039f3a0c9cfd0e84ffe83a0961bb5991d95

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

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

    void createTable(String timeUnits);

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

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