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

cjl

2023-07-24 72b62513dbb8621658628a07001c5a159c130738

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

@@ -14,4 +14,7 @@

    void insertHistoryHourly(Map<String, Object> params);


    Map<String,Object> selectHistoryHourly(Map<String, Object> params);

}