Merge remote-tracking branch 'origin/master'

zhongrj

2024-01-31 a5c2a3b99f46866a666618bc461340aa4e679b1c

 src/main/java/org/springblade/modules/category/mapper/CategoryMapper.xml

@@ -30,6 +30,7 @@
        <if test="category.parentNo!=null and category.parentNo!=''">
            and parent_no = #{category.parentNo}
        </if>
        order by -sort desc
    </select>

    <select id="selectCategoryList" resultType="org.springblade.modules.category.dto.CategoryDTO">