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

guoshilong

2023-06-05 70f08b8141b9ef7acb987ffdd59c94583f26a1c5

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

@@ -29,7 +29,7 @@
    */
   @GetMapping(CREATE_ALARM_NOTICE_TASK_JOB_HANDLER)
   @Override
   public Object createAlarmNoticeTaskJobHandler(String name, String content, String type) {
   public String createAlarmNoticeTaskJobHandler(String name, String content, String type) {
      return applicationContext.doSomethingByStrategy(name, content, type);
   }
}