Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 8a28bb397d5743edf1da5930db0d6d0fdd86b35e

 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml

@@ -31,5 +31,23 @@
        </if>
    </select>

    <!--自定义分页-->
    <select id="getDistrictTree" resultType="org.springblade.common.node.TreeStringNode">
        SELECT
        code as id,
        parent_code as parentId,
        name
        FROM blade_region where district_code = '361102'
        union all
        (
        select
        id,
        community_code as parentId,
        name
        from jczz_district
        where is_deleted = 0
        )
    </select>


</mapper>