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

cjl

2023-08-23 ecff6c40a1728c61c6a9a713df721b0eb31a616c

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