From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 14:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index e7037c6..428d483 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -71,14 +71,8 @@
 
     @GetMapping("/yw-condition/{id}")
     @ApiOperation(value = "杩愮淮鎯呭喌", notes = "杩愮淮鎯呭喌")
-    public Result ywCondition(@PathVariable @Validated(Update.class) String id) {
+    public Result ywCondition(@PathVariable Integer id) {
         return workOrderService.selectYwConditionByYwId(id);
-    }
-
-    @GetMapping("/yw-condition-list/{id}")
-    @ApiOperation(value = "杩愮淮鎯呭喌璁板綍", notes = "杩愮淮鎯呭喌璁板綍")
-    public Result ywConditionList(@PathVariable @Validated(Update.class) String id) {
-        return workOrderService.selectYwConditionListByYwId(id);
     }
 
     @GetMapping("/yw-auditing-list/{id}")

--
Gitblit v1.8.0