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

jinpengyong

2023-08-31 e77cdf62567ba92d2d3131da20429dcbfc3b7ea2

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