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-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java
index 11fe8f5..bc1d4d9 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java
@@ -25,7 +25,7 @@
 	 * @return
 	 */
 	@GetMapping(CREATE_ALARM_NOTICE_TASK_JOB_HANDLER)
-	Object createAlarmNoticeTaskJobHandler(@RequestParam("name") String name,
+	String createAlarmNoticeTaskJobHandler(@RequestParam("name") String name,
 										   @RequestParam("content") String content,
 										   @RequestParam("title") String type);
 

--
Gitblit v1.9.3