From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java
index dec4be6..d648a6b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java
@@ -35,9 +35,9 @@
}
@ApiOperation("鐜荤拑鏂欐灦搴撳瓨鏌ヨ鎺ュ彛")
- @PostMapping("/getSelectFinishedGlassShelfInformation/{pageNum}/{pageSize}")
- public Result getSelectFinishedGlassShelfInformation(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
- return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformation(pageNum,pageSize));
+ @PostMapping("/getSelectFinishedGlassShelfInformation/{pageNum}/{pageSize}/{type}")
+ public Result getSelectFinishedGlassShelfInformation(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable String type){
+ return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformation(pageNum,pageSize,type));
}
@ApiOperation("鐜荤拑鏂欐灦搴撳瓨鏌ヨ鎺ュ彛")
@@ -54,8 +54,8 @@
@ApiOperation("鐜荤拑鏂欐灦鏂板鍑哄簱鏄庣粏鏌ヨ鎺ュ彛")
@PostMapping("/getSelectFinishedGlassShelfInformationDetails/{pageNum}/{pageSize}")
- public Result getSelectFinishedGlassShelfInformationDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody String ids){
- return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformationDetails(pageNum,pageSize,ids));
+ public Result getSelectFinishedGlassShelfInformationDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody List<Map<String, Object>> object){
+ return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformationDetails(pageNum,pageSize,object));
}
@ApiOperation("鐜荤拑鏂欐灦缂栬緫鍑哄簱鏄庣粏鏌ヨ鎺ュ彛")
--
Gitblit v1.8.0