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

cjl

2023-07-13 bfae0be9c3980b6ec09f86bcb543bb8960927e14

 screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/BarChartTableOfPollutionLevelVO.java

@@ -89,7 +89,7 @@
        vo.setSerious(serious);
        vo.setServer(server);


        return vo;
    }
}