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

cjl

2023-09-26 346288bc38bdab442721d7609caed86d03b9d2d4

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