Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml

@@ -232,7 +232,7 @@
        SELECT
        code,parent_code,name,ancestors,region_level,sort
        FROM blade_region
        where ancestors like concat('%',#{regionCode},'%')
        where (ancestors like concat('%',#{regionCode},'%') or code = #{regionCode})
        union all
        (
        SELECT
@@ -244,7 +244,7 @@
        jg.sort
        FROM blade_region br
        right join jczz_grid jg on jg.community_code = br.village_code and jg.is_deleted = 0
        where br.ancestors like concat('%',#{regionCode},'%')
        where (br.ancestors like concat('%',#{regionCode},'%') or br.code = #{regionCode})
        )
    </select>