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

guoshilong

2023-06-02 458eba2d12e1c45ffd019c4b624c6fbc6e843add

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

@@ -12,6 +12,16 @@
public class AlarmRecordVO extends AlarmRecord {

   /**
    * 区域名称
    */
   private String areaName;

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

   /**
    * 告警分类
    */
   private String type;