From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +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/sd/ProductController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 4fa78fa..11765f6 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
@@ -28,8 +28,8 @@
public Result defaultDateProduct(@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@PathVariable List<String> glassType,
- @RequestBody Product product){
- return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,product));
+ @RequestBody Map<String,Object> config){
+ return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,config));
}
@ApiOperation("鍏朵粬绯荤粺鑾峰彇浜у搧鏌ヨ鎺ュ彛")
@PostMapping("/otherSysGetProduct")
--
Gitblit v1.8.0