From 5fad5b026148771b103a6eed0e46dfcad3ee24a0 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 25 十一月 2024 18:38:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
index 543d206..c60de73 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -1,7 +1,8 @@
package com.ruoyi.other.controller;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.GoodsCategory;
import com.ruoyi.other.service.GoodsCategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -10,6 +11,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -27,9 +29,9 @@
private GoodsCategoryService goodsCategoryService;
@GetMapping("/list")
- @ApiOperation(value = "商品分类列表")
- public AjaxResult list(){
- return AjaxResult.success(goodsCategoryService.list());
+ @ApiOperation(value = "商品分类列表", tags = {"小程序-商城-商城-首页-筛选"})
+ public R<List<GoodsCategory>> list(){
+ return R.ok(goodsCategoryService.list());
}
}
--
Gitblit v1.7.1