From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
index ff55404..4612f0b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
@@ -32,11 +32,21 @@
@ApiModel(value = "AlarmVO对象", description = "AlarmVO对象")
public class AlarmVO extends Alarm {
private static final long serialVersionUID = 1L;
- private String addvnm;
- private String serialNumber;
- private String stype;
- private String channelNumber;
- private String beginTime;
- private String endTime;
- private String name;
+ private String addvnm;
+ private String serialNumber;
+ private String stype;
+ private String channelNumber;
+ private String beginTime;
+ private String endTime;
+ private String name;
+ private String oneContacts;
+ private String twoContacts;
+ private String ThreeContacts;
+ private String onePhone;
+ private String twoPhone;
+ private String ThreePhone;
+ private String oneId;
+ private String twoId;
+ private String threeId;
+ private String deptId;
}
--
Gitblit v1.9.3