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

guoshilong

2024-03-13 c8b03d3da4e29fc3fb9a42ca157738256c331a00

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

@@ -31,5 +31,19 @@
    * @return
    */
   @DS("znwh")
   List<Map<String, Object>> getNotConnectPatrolPersonList(String taskId,String callId);
   List<Map<String, Object>> getNotConnectPatrolPersonList(List<String> taskId,String callId);

   /**
    * 查询符合当前时间外呼任务id集合
    * @param time
    * @return
    */
   List<String> getTaskIdListByTime(String time);

   /**
    * 获取短信类型树（当为告警是显示告警规则名称）
    *
    * @return
    */
    Object getSmsTypeTree();
}