From 72f1897ad39638eee7a22b28477b28e99accfc7f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 15:16:54 +0800
Subject: [PATCH] 合并代码
---
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 a56e2db..6b2f350 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
@@ -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));
}
/**
--
Gitblit v1.7.1