From 02fe295ee1dc726717cc005de584d0ebd05d8e92 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 11 Jun 2021 10:02:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-publicSecurity
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
index 16724a1..940a703 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
@@ -162,8 +162,17 @@
private String aaddress;
private String uids;
-// @TableLogic
-// private Integer isDeleted;
+ /**
+ * 接警的保安人员 id
+ */
+ @TableField("securityId")
+ private String securityId;
+
+ /**
+ * 通知的保安人员的 id 字符串，多个连接
+ */
+ @TableField("securityArr")
+ private String securityArr;
}
--
Gitblit v1.9.3