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

cjl

2023-10-13 f976feb7ae339c006af150b30802f7edfc8d966f

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

@@ -1,5 +1,7 @@
package com.moral.api.mapper;

import org.apache.ibatis.annotations.Param;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.entity.HistoryHourly;

@@ -26,6 +28,11 @@

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

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

}