From 515973966fa1b60b30f9dbb0062d7198e5fcce85 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 03 Jun 2023 16:13:09 +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 |    8 +++++++-
 1 files changed, 7 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..72e8536 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,10 +41,16 @@
 	/**
 	 * 通知类型 1:水情告警 2：雨情告警
 	 */
-	@ApiModelProperty(value = "通知类型")
+	@ApiModelProperty(value = "通知类型:1:水情告警 2：雨情告警")
 	private String noticeType;
 
 	/**
+	 * 通知方式:短信，电话，站内信
+	 */
+	@ApiModelProperty(value = "通知方式:短信，电话，站内信")
+	private String noticeMode;
+
+	/**
 	 * 模板内容
 	 */
 	@ApiModelProperty(value = "模板内容")

--
Gitblit v1.9.3