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

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

 screen-api/src/main/java/com/moral/api/vo/HistoryHourlyVo.java

@@ -38,6 +38,7 @@

    private Double a99054;

    private int organizationId;
    public Double getA34004() {
        return Objects.nonNull(a34004)?a34004:0d;
    }