Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml

@@ -71,7 +71,7 @@
        aoi_code aoiCode
        from jczz_district
        where is_deleted = 0
        <if test="district.districtIdList!=null and district.districtIdList!=''">
        <if test="district.districtIdList!=null and district.districtIdList.size() > 0">
            and id in
            <foreach collection="district.districtIdList" item="item" separator ="," open="("  close=")">
                #{item}