Merge remote-tracking branch 'origin/wb' into wb

cjl

2023-09-28 39dc3d6f7168eae8fda1b0fe6671be819d35c732

 screen-api/src/main/resources/mapper/CityAqiDailyMapper.xml

@@ -23,7 +23,7 @@
            GROUP BY c.city_code order by nums
        </if>
        <if test="type == 3 ">
            and c.time <![CDATA[>=]]> #{start}
            and DATE_FORMAT(c.time,'%Y') <![CDATA[>=]]> #{start}
            GROUP BY c.city_code order by nums
        </if>
    </select>