From 312fba0280bd1f4b5405a5b9fce9b898b9a50adf Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 12 Jul 2023 19:05:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

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

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java
index 7bb65ac..26871d2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java
@@ -92,4 +92,10 @@
 	 * @param list
 	 */
 	void sendEmailMsg(List<String> list, SmsRequest smsRequest);
+
+	/**
+	 * 发送合并水库名短信
+	 * @param smsRequestTemplate
+	 */
+	void sendMergeSignMsg(SmsRequestTemplate smsRequestTemplate);
 }

--
Gitblit v1.9.3