Merge branch 'master' into feature-management-2021-9-16

fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java

@@ -107,7 +107,7 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
         //1级告警
         if (1 == type){
             gradeList = Arrays.stream(AlarmGradeCode.values())
-                    .filter(alarmGradeCode -> alarmGradeCode.name().equals(AlarmGradeCode.DevOffline.name()))
+                    .filter(alarmGradeCode -> !alarmGradeCode.name().equals(AlarmGradeCode.DevOffline.name()))
                     .map(Enum::name).collect(Collectors.toList());
         }else if (2 == type){
             gradeList = Arrays.stream(AlarmGradeCode.values())