Merge remote-tracking branch 'origin/master'

linwei

2024-01-10 f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8

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

@@ -151,6 +151,7 @@
            LEFT JOIN jczz_property_district_user jpdu ON jpcd.id = jpdu.property_company_district_id
            LEFT JOIN blade_user bu ON locate(jpdu.user_id,bu.id)>0 and bu.is_deleted = 0
        WHERE jpc.is_deleted = 0
        and bu.real_name is not null
        and jpc.id = #{propertyCompany.id}
    </select>