From 03331f46c05015df9debef834e752b2f9d13f9e0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 15:19:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 7b59d65..b6c5b53 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
@@ -5,9 +5,10 @@
import com.ruoyi.other.api.domain.GoodsCategory;
import com.ruoyi.other.service.GoodsCategoryService;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -22,19 +23,26 @@
*/
@RestController
@RequestMapping("/goods-category")
+@Api(tags = "商品分类")
public class GoodsCategoryController {
@Resource
private GoodsCategoryService goodsCategoryService;
- @PostMapping("/index/list")
+ @GetMapping("/index/list")
@ApiOperation(value = "商品分类", tags = {"小程序-首页"})
- public R<List<GoodsCategory>> list(){
- List<GoodsCategory> list = goodsCategoryService.lambdaQuery()
+ public R<List<GoodsCategory>> indexlist(){
+ List<GoodsCategory> indexlist = goodsCategoryService.lambdaQuery()
.orderByDesc(GoodsCategory::getCreateTime)
.last("limit 8")
.list()
;
- return R.ok(list);
+ return R.ok(indexlist);
}
+ @GetMapping("/list")
+ @ApiOperation(value = "商品分类列表", tags = {"小程序-商城-商城-首页-筛选"})
+ public R<List<GoodsCategory>> list(){
+ return R.ok(goodsCategoryService.list());
+ }
+
}
--
Gitblit v1.7.1