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

guoshilong

2023-07-12 312fba0280bd1f4b5405a5b9fce9b898b9a50adf

 skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordDetailVO.java

@@ -12,4 +12,9 @@
public class AlarmRecordDetailVO extends AlarmRecordDetail {

   private Integer isExport;

   /**
    * 水库名称
    */
   private String reservoirName;
}