From 95bd45377f1e04b448d407e3af4ee2707b90a24b Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:07:52 +0800
Subject: [PATCH] MOM系统-8-17计量管理版本一结束
---
standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 4233c11..f980a60 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -143,12 +143,13 @@
@ApiOperation(value = "鍒犻櫎鏍戞ā鍧楁暟鎹�", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "鏍规嵁璁惧Id鍒犻櫎", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "type", value = "璁惧绫诲瀷", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "deviceFather", value = "鏍规嵁璁惧鍒嗙被鍒犻櫎", dataTypeClass = String.class)
})
@DeleteMapping("/deleteIdorFather")
- public Result<?> deviceDeleteIdOrFather(Integer id, String deviceFather){
- Integer map = deviceService.deviceDeleteIdOrFather(id, deviceFather);
- if (map == 1){
+ public Result<?> deviceDeleteIdOrFather(Integer id, Integer type, String deviceFather){
+ Integer map = deviceService.deviceDeleteIdOrFather(id, type, deviceFather);
+ if (map >= 1){
return Result.success("鍒犻櫎鎴愬姛锛�");
}
return Result.fail("鍒犻櫎澶辫触锛�");
--
Gitblit v1.9.3