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

cjl

2023-11-10 0920f23406e52e4c7149515797a317c836c9e065

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

@@ -30,6 +30,9 @@

    void insertHistoryHourlyComplete(@Param("list") List<Map<String, Object>> list, @Param("timeUnits") String timeUnits);


    void insertHistoryHourlyAvg(@Param("list") List<Map<String, Object>> list, @Param("timeUnits") String timeUnits);

}