From 08c7fcce9fa2a876412fa81a19550b77996214e2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 20:18:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java
index f09afeb..5a7084c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java
@@ -77,7 +77,6 @@
 
 	/**
 	 * 通过id删除
-	 *
 	 * @param id
 	 * @return
 	 */

--
Gitblit v1.9.3