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

cjl

2023-09-03 b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7

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

}