From 6f2a4980f4ca7a794b103cfde9946a905c5ba399 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期五, 26 一月 2024 16:21:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 d948a09..9674f9b 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
@@ -1,9 +1,13 @@
package com.example.erp.controller.sd;
import com.example.erp.common.Result;
+import com.example.erp.entity.sd.Product;
import com.example.erp.service.sd.ProductService;
+import org.apache.ibatis.annotations.Delete;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping("/product")
@@ -11,8 +15,8 @@
@Autowired
ProductService productService;
- @GetMapping("/{pageNum}/{pageSize}")
- public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
- return Result.seccess(productService.defaultDateProduct(pageNum,pageSize));
+ @PostMapping ("/{pageNum}/{pageSize}/{glassType}")
+ 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));
}
}
--
Gitblit v1.8.0