From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
index 3a4898e..adc6661 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
@@ -41,8 +41,14 @@
 	/**
 	 * 通知类型 1:水情告警 2:雨情告警
 	 */
-	@ApiModelProperty(value = "通知类型")
+	@ApiModelProperty(value = "通知类型:1:水情告警 2:雨情告警")
 	private String noticeType;
+
+	/**
+	 * 通知方式:短信,电话,站内信
+	 */
+	@ApiModelProperty(value = "通知方式:短信,电话,站内信")
+	private String noticeMode;
 
 	/**
 	 * 模板内容
@@ -62,4 +68,10 @@
 	@ApiModelProperty(value = "备注")
 	private String remark;
 
+	/**
+	 * 短信类型(登录,告警,,,)
+	 */
+	@ApiModelProperty(value = "短信类型")
+	private Integer smsType;
+
 }

--
Gitblit v1.9.3