Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-07-10 6344a8b6b7e2853dbfa9e6506ff2e17a31930297

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