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

server-service/src/main/java/com/makeit/service/platform/dataScreen/impl/DataScreenServiceImpl.java

@@ -483,6 +483,7 @@ public class DataScreenServiceImpl implements DataScreenService {
             listVo.setType(record.getAlarmType());
             listVo.setAlarmDate(record.getAlarmDate().format(df));
             listVo.setAlarmTime(record.getAlarmDate().format(dft));
+            listVo.setAlarmRecordId(record.getId());
             list.add(listVo);
         }
 

server-service/src/main/java/com/makeit/vo/platform/dataScreen/PlatAlarmStatisticsListVo.java

@@ -28,4 +28,6 @@ public class PlatAlarmStatisticsListVo {
     private String alarmTime;
     @ApiModelProperty(value = "路径")
     private String path;
+    @ApiModelProperty(value = "告警id")
+    private String alarmRecordId;
 }