From 70f08b8141b9ef7acb987ffdd59c94583f26a1c5 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 05 Jun 2023 15:45:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/feign/NoticeFeignClient.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/feign/NoticeFeignClient.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/feign/NoticeFeignClient.java
index c00c5c5..ed6db28 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/feign/NoticeFeignClient.java
+++ b/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);
 	}
 }

--
Gitblit v1.9.3