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

cjl

2023-09-06 d50faa74719f4d3f18ec9f99d99483f2c119c3a0

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