Merge remote-tracking branch 'origin/master'

linwei

2024-01-19 f3dac2f82e3a6e2836a15a66df4bafd4f5cfd733

 src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml

@@ -114,7 +114,7 @@
               parent_code as parentId,
               name
        FROM blade_region
        where district_code = '361102'
        where district_code = '361102000000'
        union all
        (select id,
                community_code as parentId,