Merge remote-tracking branch 'origin/master'

linwei

2024-01-24 bdc5d99198b06b9e3fd5e6794d2efea36398b60a

 src/main/java/org/springblade/modules/property/mapper/PropertyCompanyDistrictMapper.xml

@@ -53,7 +53,7 @@
        <if test="propertyCompanyDistrict.propertyCompanyName!=null and propertyCompanyDistrict.propertyCompanyName!=''">
            and jpc.name like concat('%',#{propertyCompanyDistrict.propertyCompanyName},'%')
        </if>
        <if test="propertyCompanyDistrict.districtIds">
        <if test="propertyCompanyDistrict.districtIds != null and propertyCompanyDistrict.districtIds.size()>0">
            and jpcd.district_id in
            <foreach collection="propertyCompanyDistrict.districtIds" item="id" open="(" close=")" separator=",">
                #{id}