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/vo/AlarmRuleVO.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleVO.java
index b3efffd..be08261 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleVO.java
@@ -1,7 +1,10 @@
package cn.gistack.sm.alarmRule.vo;
import cn.gistack.sm.alarmRule.entity.AlarmRule;
+import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
import lombok.Data;
+
+import java.util.List;
/**
* 告警规则vo
@@ -10,4 +13,15 @@
*/
@Data
public class AlarmRuleVO extends AlarmRule{
+
+ /**
+ * 规则明细
+ */
+ private List<AlarmRuleDetailVO> alarmRuleDetailList;
+
+
+ /**
+ * 是否导出
+ */
+ private Integer isExport;
}
--
Gitblit v1.9.3