From 97c3f97a11524d8bacc6d36cf2ec4e3b93b5c277 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期三, 27 十二月 2023 10:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
index f24f2bb..d948a09 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
@@ -3,9 +3,7 @@
import com.example.erp.common.Result;
import com.example.erp.service.sd.ProductService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/product")
@@ -13,9 +11,8 @@
@Autowired
ProductService productService;
- @GetMapping
- public Result defaultDateProduct(){
- //璋冪敤productService鐨刣efaultDateProduct鏂规硶锛岃繑鍥炵粨鏋�
- return Result.seccess(productService.defaultDateProduct());
+ @GetMapping("/{pageNum}/{pageSize}")
+ public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
+ return Result.seccess(productService.defaultDateProduct(pageNum,pageSize));
}
}
--
Gitblit v1.8.0