Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

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

@@ -76,7 +76,6 @@
            blade_dict_biz bdb
        where
            1=1

        and bdb.parent_id = 0
    </select>