Merge remote-tracking branch 'origin/master'

zengh

2021-03-20 a994a88cbc681965c07a54147720cf89dd329c14

 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));
   }