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

jinpengyong

2023-10-13 bb6856a82a588f05040b0410a9747ae8029bb3be

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

@@ -9,5 +9,7 @@

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

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

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