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

jinpengyong

2023-10-25 02a6c170797c5d2750ed07b21f22396a7683c54e

 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>