From ec7b4d21f1de3c8d0e1838bb15b9b395f8055e36 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Apr 2024 15:41:33 +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 1170b61..bd445fd 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  折线警戒面：131611
+	 * 事件类型  视频丢失：131329，视频遮挡：131330，移动侦测：131331，越界侦测：131585，区域入侵：131588，徘徊侦测：131590，人员聚集：131593
 	 */
 	private String eventTypes;
 

--
Gitblit v1.9.3