From 16f44651a78d00943aea51b26fc6a4f20518a648 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jan 2021 16:29:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java b/src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java
index c08a8dd..6635d06 100644
--- a/src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java
+++ b/src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java
@@ -33,5 +33,9 @@
public class AlarmVO extends Alarm {
private static final long serialVersionUID = 1L;
private String addvnm;
+ private String serialNumber;
+ private String stype;
+ private String channelNumber;
+
}
--
Gitblit v1.9.3