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

cjl

2023-10-16 0eaefd62a7caa039a4f16e27be279eac5e84da5c

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

}