Merge remote-tracking branch 'origin/master'

linwe

2023-12-08 aa237538c7e5f71f92372cc6deda1b1fac2e79e5

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

@@ -109,6 +109,9 @@
        parent_code as parentId,
        name
        FROM blade_region where district_code = '361102'
        <if test="parentCode!=null">
            and parent_code = #{parentCode}
        </if>
    </select>

</mapper>