From a994a88cbc681965c07a54147720cf89dd329c14 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 20 Mar 2021 18:45:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 5c0cb30..cf73350 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -176,8 +176,8 @@
 
 
 
-		return null;
-		//return R.status(alarmService.saveOrUpdate(alarm));
+		//return null;
+		return R.status(alarmService.saveOrUpdate(alarm));
 	}
 
 

--
Gitblit v1.9.3