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

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

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

}