Merge remote-tracking branch 'origin/master'

k94314517

2025-04-11 4d4394311a96e15ea204e2cae03dda00750d0fdd

 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);