From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |    5 +++--
 1 files changed, 3 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 6232702..472659c 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
@@ -61,6 +61,7 @@
         goods.setIntegral(getPoint(goods.getSellingPrice()));
         goods.setDelFlag(0);
         goods.setCreateTime(LocalDateTime.now());
+
         goodsService.addGoods(goods);
         return R.ok();
     }
@@ -116,10 +117,10 @@
      */
     @GetMapping("/manageGoodsList")
     @ApiOperation(value = "商品列表", tags = {"管理后台-商品管理"})
-    public R<IPage<Goods>> manageGoodsList(@ApiParam("页码") @RequestParam Integer pageNum,
+    public R<PageInfo<Goods>> manageGoodsList(@ApiParam("页码") @RequestParam Integer pageNum,
                                            @ApiParam("每一页数据大小") Integer pageSize,
                                            Goods goods){
-        return R.ok(goodsService.getManageGoodsList(new Page<>(pageNum, pageSize), goods));
+        return  goodsService.getManageGoodsList(pageNum,pageSize,goods);
     }
 
     /**

--
Gitblit v1.7.1