From ba0d1fc83bd92fac5ff86355945086716fc82044 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 14 Aug 2023 15:05:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java
index 27a0771..1170b61 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java
@@ -13,7 +13,7 @@
 	private Integer type;
 
 	/**
-	 * 事件类型  区域入侵：131588，徘徊侦测：131590  视频丢失：131329
+	 * 事件类型  区域入侵：131588，徘徊侦测：131590  视频丢失：131329  折线警戒面：131611
 	 */
 	private String eventTypes;
 

--
Gitblit v1.9.3