Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

@@ -53,6 +53,9 @@
            and parent_id > 0
            and is_sealed = 0
            and is_deleted = 0
        <if test="param2!=null">
            and parent_id = #{param2}
        </if>
    </select>

    <select id="tree" resultMap="treeNodeResultMap">