Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-25 abd19b59926737dad2ca58331bcf38a2f3d1d32b

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java

@@ -27,7 +27,7 @@
    private GoodsCategoryService goodsCategoryService;

    @GetMapping("/list")
    @ApiOperation(value = "商品分类列表")
    @ApiOperation(value = "商品分类列表", tags = {"小程序-商城-商城-首页-筛选"})
    public AjaxResult list(){
        return AjaxResult.success(goodsCategoryService.list());
    }