From 28d1b11176dbddfc6bb966f2b1d8776b946dd9be Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 17:34:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |    9 ++++++---
 1 files changed, 6 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 8437f2b..f5d19af 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
@@ -31,6 +31,9 @@
     @Resource
     private GoodsService goodsService;
 
+
+
+
     /**
      * 商品列表
      */
@@ -47,9 +50,9 @@
      */
     @GetMapping("/getGoodsListByShopId")
     @ApiOperation(value = "商品列表", tags = {"小程序-首页-门店详情-商品购买列表"})
-    public R<List<Goods>> getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
+    public R<TableDataInfo> getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
         startPage();
-        return R.ok(goodsService.getGoodsListByShopId(shopId));
+        return R.ok(getDataTable(goodsService.getGoodsListByShopId(shopId)));
     }
 
 
@@ -94,6 +97,6 @@
         List<Goods> goods = goodsService.lambdaQuery().in(Goods::getId, ids).eq(Goods::getStatus, 0).list();
         return R.ok(goods);
     }
-    
+
 }
 

--
Gitblit v1.7.1