Merge branch 'cjl' into qa

cjl

2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b

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

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

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

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