Merge remote-tracking branch 'origin/master'

linwei

2024-02-06 180905ee0e0fd86ff59d7aae19fd49d8618bd95b

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

@@ -21,6 +21,7 @@
        LEFT JOIN jczz_grid jg ON jp.grid_code = jg.grid_code AND jg.is_deleted = 0
        WHERE
        jpe.is_deleted = 0
        and jp.place_name != ''
        <if test="isAdministrator==2">
            <choose>
                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">