From eab1c7170a901f354bb8bf5c62e5a12c4d73d88b Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期四, 28 七月 2022 10:36:59 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/controller/WorksheetLinkController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorksheetLinkController.java b/src/main/java/com/whyc/controller/WorksheetLinkController.java
index 7ebb798..f5dfe6c 100644
--- a/src/main/java/com/whyc/controller/WorksheetLinkController.java
+++ b/src/main/java/com/whyc/controller/WorksheetLinkController.java
@@ -6,7 +6,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("worksheetLink")
@@ -21,7 +24,7 @@
* @return
*/
@PostMapping("audit")
- @ApiOperation(value = "缁忕悊瀹℃牳",notes = "浼犲弬:int id,int linkStatus,String dealReason,int mainId,int nextUser;" +
+ @ApiOperation(value = "缁忕悊瀹℃牳",notes = "浼犲弬:int id,int linkStatus,String dealReason,int mainId,int nextUser,int rejectVersion;" +
"linkStatus:1閫氳繃,2椹冲洖;dealReason:瀹℃牳鎰忚")
public Response audit(@RequestBody WorksheetLink link){
service.audit(link);
@@ -30,7 +33,7 @@
@PostMapping("approve")
- @ApiOperation(value = "鎬荤粡鐞嗗鎵�",notes = "浼犲弬:int id,int linkStatus,String dealReason,int mainId;" +
+ @ApiOperation(value = "鎬荤粡鐞嗗鎵�",notes = "浼犲弬:int id,int linkStatus,String dealReason,int mainId,int rejectVersion;" +
"linkStatus:1閫氳繃,2椹冲洖,椹冲洖鍒板憳宸�,閫氱煡缁忕悊;dealReason:瀹℃牳鎰忚")
public Response approve(@RequestBody WorksheetLink link){
service.approve(link);
--
Gitblit v1.9.1