From 37fce1a5a19d25453eb7481ce56eb71423e72af1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 25 四月 2024 11:43:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
index 1f41cbf..8c49ace 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
@@ -28,9 +28,9 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
@ApiOperation("瀹㈡埛鏌ヨ鎺ュ彛")
- @PostMapping("/getseletCustomer/{pageNum}/{pageSize}")
- public Result getseletShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Customer customer){
- return Result.seccess(customerService.getseletCustomer(pageNum,pageSize,customer));
+ @PostMapping("/getSelectCustomer/{pageNum}/{pageSize}")
+ public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Customer customer){
+ return Result.seccess(customerService.getSelectCustomer(pageNum,pageSize,customer));
}
@ApiOperation("瀹㈡埛鏂板淇敼鎺ュ彛")
@@ -59,6 +59,12 @@
}
}
+ @ApiOperation("瀹㈡埛璁㈠崟鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectCustomerOderDate/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectCustomerOderDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody OrderDetail orderDetail){
+ return Result.seccess(customerService.getSelectCustomerOderDate(pageNum,pageSize,selectDate,orderDetail));
+ }
+
--
Gitblit v1.8.0