Merge remote-tracking branch 'origin/master'

linwei

2024-02-20 002e205541a8b354f8178bc40833257f733d0d1d

Merge remote-tracking branch 'origin/master'

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

@@ -157,14 +157,9 @@

    <select id="getDetailVO" resultType="org.springblade.modules.property.vo.PropertyCompanyDetailVO">
        SELECT
            jpc.*,
            jpcd.principal,
            jpcd.principal_phone AS principalPhone,
            jpdu.id AS cid
            jpc.*
        FROM
            jczz_property_company jpc
                LEFT JOIN jczz_property_company_district jpcd ON jpcd.property_company_id = jpc.id and jpcd.is_deleted = 0
                LEFT JOIN jczz_property_district_user jpdu ON jpcd.id = jpdu.property_company_district_id
        WHERE jpc.is_deleted = 0
          and jpc.id = #{propertyCompany.id}
    </select>