Merge remote-tracking branch 'origin/master'

jiangping

2025-04-10 9f7777c83f2d07c8d83c506ab2a13bc543f47de9

 server/src/main/java/com/doumee/service/business/CategoryService.java

@@ -102,7 +102,7 @@
     * @param categoryType
     * @return
     */
    List<CategoryVO>  getCategoryVOTree(Integer categoryType);
    List<CategoryVO>  getCategoryVOTree(String categoryType);

    List<CategoryVO>  getCategoryVOList(Integer categoryType);