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

cjl

2023-11-01 856f1cf8ee52443ce616ce00ecff7cbb7c30f000

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

@@ -42,4 +42,8 @@
    void insertHistoryHourly(Map<String, Object> params);

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

    List<HistoryHourly> listResult(Map<String, Object> params);

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