From 30ddf6570494f77a3dde98e5cd85c07cb340f51a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 14:42:43 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |   10 +++++++---
 1 files changed, 7 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..9789b16 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,10 +44,14 @@
      * 商品详情
      */
     @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