From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 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..8bb05dd 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,33 @@
@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;
+ private String timeDesc;
+
+ private String securityArr;
+ private String securityId;
+ private String baname;
+ private String baid;
+ private String baphone;
+
+ private String deptName;
+ private String deviceName;
+ private String manufacturers;
+
}
--
Gitblit v1.9.3