Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21

jinpengyong

2023-08-22 e6f974ca6eab798c2df5c09cdb8320ecf4ff4185

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