From a29a8d00dd9bbcde53814119ad4a081f3b4c6740 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 06 Sep 2021 13:24:28 +0800
Subject: [PATCH] screen-manage 插入设备的时候，判断组织是否含有型号并且添加默认报警值
---
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
index 3b8b6ac..0a8a6b5 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java
@@ -52,9 +52,9 @@
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
if (code == 0){
- return ResultMessage.ok(msg);
+ return ResultMessage.ok(code,msg);
}
- return ResultMessage.fail(msg);
+ return ResultMessage.fail(code,msg);
}
@ApiOperation(value = "������������", notes = "������������")
@@ -70,9 +70,9 @@
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
if (code == 0){
- return ResultMessage.ok(msg);
+ return ResultMessage.ok(code,msg);
}
- return ResultMessage.fail(msg);
+ return ResultMessage.fail(code,msg);
}
@ApiOperation(value = "������������", notes = "������������")
@@ -85,9 +85,9 @@
String msg = resultMap.get("msg").toString();
int code = Integer.parseInt(resultMap.get("code").toString());
if (code == 0){
- return ResultMessage.ok(msg);
+ return ResultMessage.ok(code,msg);
}
- return ResultMessage.fail(msg);
+ return ResultMessage.fail(code,msg);
}
@ApiOperation(value = "������������������", notes = "������������������")
--
Gitblit v1.8.0