From 4e7379646247c5b059106f63c7f1e9c8f535848e Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 19 七月 2022 15:16:58 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/WorksheetMainController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetMainController.java b/src/main/java/com/whyc/controller/WorksheetMainController.java
index 77428db..43e8233 100644
--- a/src/main/java/com/whyc/controller/WorksheetMainController.java
+++ b/src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -2,6 +2,7 @@
import com.whyc.dto.Response;
import com.whyc.pojo.DocUser;
+import com.whyc.pojo.ProductBomApproving;
import com.whyc.pojo.WorksheetMain;
import com.whyc.service.WorksheetMainService;
import com.whyc.util.ActionUtil;
@@ -10,6 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
@RestController
@@ -21,8 +23,8 @@
private WorksheetMainService service;
@PostMapping("submit")
- @ApiOperation("鍥剧焊鎻愪氦")
- public Response submit(@RequestBody WorksheetMain main){
+ @ApiOperation("浜у搧鍥剧焊鍙奲om鎻愪氦")
+ public Response submit(@RequestBody WorksheetMain main, @RequestBody List<ProductBomApproving> bomList){
DocUser user = ActionUtil.getUser();
boolean res = service.submit(main,user);
if(res) {
--
Gitblit v1.9.1