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

cjl

2023-09-28 10b5e4880762d517c857ae76b098b8749a261fb0

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

@@ -8,4 +8,6 @@
    void createTable(String timeUnits);

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

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