Merge remote-tracking branch 'origin/master'

lin

2024-02-28 92a3b953f2da493e68afb9ae73a15b6513a6c18a

 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml

@@ -323,6 +323,7 @@
        select
        jp.id,
        jp.house_code,
        jp.house_code_binds,
        jp.building_code,
        jp.principal_user_id,
        jp.principal,
@@ -361,7 +362,12 @@
        left join jczz_doorplate_address jda on jda.address_code = jp.house_code
        where jp.is_deleted = 0
        <if test="place.houseCode!=null and place.houseCode!=''">
            and jp.house_code like concat('%',#{place.houseCode},'%')
            and
            (
            jp.house_code = #{place.houseCode}
            or
            jp.house_code_binds like concat('%',#{place.houseCode},'%')
            )
        </if>
        <if test="place.id!=null">
            and jp.id = #{place.id}