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

jinpengyong

2023-11-01 87172c08a55e972ff850ab3542858d11d66505ca

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

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

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

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