Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-07-12 312fba0280bd1f4b5405a5b9fce9b898b9a50adf

 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);
}