From 4aff3b8d0640e9a84f7408100551e740bacaa2a0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 09 八月 2024 11:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index e4ac1e7..747f7bd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -31,12 +31,13 @@
@ApiOperation("鎶ュ伐鏂板鏌ヨ")
@SaCheckPermission("AddReportingWork.search")
- @PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}")
+ @PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}/{reportType}")
public Result AddSelectLastWork(
@PathVariable String processIdStr,
@PathVariable String technologyStr,
- @PathVariable String process) {
- return Result.seccess(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process));
+ @PathVariable String process,
+ @PathVariable String reportType) {
+ return Result.seccess(reportingWorkService.AddSelectLastWorkSv(processIdStr,technologyStr,process,reportType));
}
@ApiOperation("鏌ヨ宸ュ簭")
@PostMapping ("/selectProcess")
--
Gitblit v1.8.0