From 84caf250d5638279d45f32af13ddd346bed2e0a4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 18:02:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 63c8837..2c1c463 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
@@ -47,9 +47,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)));
}
--
Gitblit v1.7.1