Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-10-18 5586964c3e63f95c9e460a6a3d85d7dca408e096

 screen-common/src/main/java/com/moral/util/AQIUtils.java

@@ -51,7 +51,9 @@
        }
        int AQIMAX = 0;
        if (!ObjectUtils.isEmpty(AQIList)) {
            AQIMAX = Collections.max(AQIList);
            if (AQIList.size() == 6) {
                AQIMAX = Collections.max(AQIList);
            }
        }
        return AQIMAX;
    }