Merge remote-tracking branch 'origin/master'

imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/api/alarm/AlarmRulesApiImpl.java

@@ -2,6 +2,7 @@ package com.inspur.module.system.api.alarm;
 
 import com.inspur.framework.common.util.json.JsonUtils;
 import com.inspur.framework.common.util.object.BeanUtils;
+import com.inspur.framework.tenant.core.aop.TenantIgnore;
 import com.inspur.module.system.api.alarm.dto.AlarmRulesRespDTO;
 import com.inspur.module.system.constant.EquipAyalyzeStatusConstant;
 import com.inspur.module.system.constant.JudgeConstant;
@@ -50,6 +51,7 @@ public class AlarmRulesApiImpl implements AlarmRulesApi{
     private EquipInfoService equipInfoService;
     
     @Override
+    @TenantIgnore
     public List<AlarmRulesRespDTO> selectAlarmRulesListByCatch(String equipId) {
         List<AlarmRulesRespDTO> alarmRules = JsonUtils.parseArray(stringRedisTemplate.opsForValue().get(equipId),AlarmRulesRespDTO.class);
         if(alarmRules == null || alarmRules.size() == 0){