From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java
index 4c6b31d..abf3384 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java
@@ -1,6 +1,7 @@
 package cn.gistack.alerts.sms.vo;
 
 import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
+import cn.gistack.alerts.alarmRule.entity.AlarmRule;
 import cn.gistack.alerts.sms.entity.SmsTemplate;
 import cn.gistack.sm.sjztmd.vo.PersonVO;
 import lombok.Data;
@@ -60,4 +61,14 @@
 	 * 短信模板对象信息
 	 */
 	private SmsTemplate smsTemplate;
+
+	/**
+	 * 是否发送站内信
+	 */
+	private Boolean isSendStation;
+
+	/**
+	 * 告警规则信息
+	 */
+	private AlarmRule alarmRule;
 }

--
Gitblit v1.9.3