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

jinpengyong

2023-08-18 4a64c0801f147536ed0a9d09977941f313a286ae

 screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java

@@ -122,4 +122,6 @@
     */
    Double calculatedValue(List<HistoryHourly> list, String sensorCode, String type, Double lower, Double upper);


    boolean historyHourly();
}