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

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

 screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java

@@ -396,7 +396,8 @@
            Map<String, Object> map = list.get(i);
            if (cityCode == (int) map.get("cityCode")) {
                int rank = i + 1;
                result.put("rank", rank + "/" + size);
                result.put("rank", rank);
                result.put("size", size);
                Object value = map.get(rankField);
                result.put("value", value);
                break;