From 31ffbaf322685984516cfb284fa58741debf4e96 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java b/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java
index 399d601..a2711a8 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java
@@ -21,6 +21,8 @@
private int warningPoint;
+ private String memo;
+
private String refId;
public String getRefId() {
@@ -89,7 +91,15 @@
this.warningPoint = warningPoint;
}
- @Override
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+ @Override
public String toString() {
return "SysAlarm{" +
"id=" + id +
--
Gitblit v1.9.2