Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-05-29 08c7fcce9fa2a876412fa81a19550b77996214e2

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleVO.java

@@ -1,7 +1,10 @@
package cn.gistack.sm.alarmRule.vo;

import cn.gistack.sm.alarmRule.entity.AlarmRule;
import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
import lombok.Data;

import java.util.List;

/**
 * 告警规则vo
@@ -10,4 +13,15 @@
 */
@Data
public class AlarmRuleVO extends AlarmRule{

   /**
    * 规则明细
    */
   private List<AlarmRuleDetailVO> alarmRuleDetailList;


   /**
    * 是否导出
    */
   private Integer isExport;
}