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

cjl

2023-09-03 b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7

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