From 33ef2b3bd1e97e392605ff4ca9a1b01f931cf447 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 12 二月 2025 15:56:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index a68b03b..06fc8bb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -72,8 +72,8 @@
@ApiOperation("璁㈠崟鍒嗛〉绛涢�夋煡璇�")
@SaCheckPermission("selectOrder.search")
@PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
- public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Order order) {
- return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType));
+ public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Map<String,Object> config) {
+ return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, config,orderType));
}
@ApiOperation("鍒犻櫎璁㈠崟")
@SaCheckPermission("selectOrder.delete")
--
Gitblit v1.8.0