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

cjl

2023-08-18 acb0dc47e516cf6942ebe268d9a3fce7944963b9

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

}