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

ke

2024-04-18 f2d0713c2b20a6c751399e2468996eafb8812988

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java

@@ -116,4 +116,13 @@
    * @return
    */
   Object importSendSms(List<SendSmsExcel> list,String templateId,String param, String content);

   /**
    * 水库测点合并发送
    * @param smsRequestTemplate
    * @return
    */
    Map<String, Object> sendSignMsgMergeCd(SmsRequestTemplate smsRequestTemplate);

   Map<String, Object> sendSignMsgMergeCdVideo(SmsRequestTemplate smsRequestTemplate);
}