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/AlarmRecordVO.java

@@ -25,4 +25,9 @@
    * 生成告警类型
    */
   private String createAlarmType;

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