From abd19b59926737dad2ca58331bcf38a2f3d1d32b Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 25 十一月 2024 11:14:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java index b1e5697..1a5b4f5 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java @@ -34,7 +34,7 @@ * 商品列表 */ @GetMapping("/goodsList") - @ApiOperation(value = "商品列表") + @ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表"}) public TableDataInfo goodsList(Goods goods){ startPage(); return getDataTable(goodsService.goodsList(goods)); @@ -44,8 +44,9 @@ * 商品详情 */ @GetMapping("/goodsDetail/{goodsId}") - public AjaxResult goodsDetail(@PathVariable("goodsId") Integer goodsId){ - return success(goodsService.getById(goodsId)); + @ApiOperation(value = "商品详情", tags = {"小程序-商城-首页-商品详情"}) + public AjaxResult goodsDetail(@PathVariable("goodsId") Long goodsId){ + return success(goodsService.goodsDetail(goodsId)); } -- Gitblit v1.7.1