合并代码

puzhibing

2024-12-11 ff2ef0cfdaf6c2217c728d4c7cd91ea47e1f3ac9

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java

@@ -48,10 +48,10 @@
     */
    @GetMapping("/manageGoodsList")
    @ApiOperation(value = "后台管理商品列表", tags = {"管理后台-商品管理-商品列表"})
    public R<IPage<Goods>> manageGoodsList(@ApiParam("页码") @RequestParam Integer PageNum,
    public R<IPage<Goods>> manageGoodsList(@ApiParam("页码") @RequestParam Integer pageNum,
                                           @ApiParam("每一页数据大小") Integer pageSize,
                                           Goods goods){
        return R.ok(goodsService.getManageGoodsList(new Page<>(PageNum, pageSize), goods));
        return R.ok(goodsService.getManageGoodsList(new Page<>(pageNum, pageSize), goods));
    }

    /**