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

guoshilong

2023-06-05 70f08b8141b9ef7acb987ffdd59c94583f26a1c5

 skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClientFallBack.java

@@ -11,7 +11,7 @@
public class NoticeClientFallBack implements NoticeClient {

   @Override
   public Object createAlarmNoticeTaskJobHandler(String name, String content, String type) {
   public String createAlarmNoticeTaskJobHandler(String name, String content, String type) {
      return null;
   }
}