From 08c7fcce9fa2a876412fa81a19550b77996214e2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 20:18:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRule.java |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRule.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRule.java
index de16996..b04a6d3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRule.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRule.java
@@ -54,11 +54,6 @@
 	private String alarmLevel;
 
 	/**
-	 * 告警方式
-	 */
-	private String alarmMode;
-
-	/**
 	 * 告警频次
 	 */
 	private String alarmFrequency;
@@ -69,17 +64,7 @@
 	private String alarmPerson;
 
 	/**
-	 * 告警内容
-	 */
-	private String alarmContent;
-
-	/**
 	 * 备注
 	 */
 	private String alarmRemark;
-
-	/**
-	 * 模板id
-	 */
-	private String templateId;
 }

--
Gitblit v1.9.3