Merge remote-tracking branch 'origin/master'

linwei

2024-02-21 86498f43cb9e6a5f8c58cca7b5c07a5ad1e23b2f

 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">