|
@@ -194,7 +194,10 @@ public class AlarmRecordWrapper {
|
|
|
|
|
|
alarmRecordListItem.setIgnoreTime(alarmRecordItem.getIgnoreTime());
|
|
alarmRecordListItem.setIgnoreTime(alarmRecordItem.getIgnoreTime());
|
|
alarmRecordListItem.setTreatEndTime(alarmRecordItem.getTreatEndTime());
|
|
alarmRecordListItem.setTreatEndTime(alarmRecordItem.getTreatEndTime());
|
|
-
|
|
|
|
|
|
+ //报警描述
|
|
|
|
+ alarmRecordListItem.setRemark(alarmRecordItem.getRemark());
|
|
|
|
+ //补充说明
|
|
|
|
+ alarmRecordListItem.setSupplement(alarmRecordItem.getSupplement());
|
|
return alarmRecordListItem;
|
|
return alarmRecordListItem;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -262,6 +265,8 @@ public class AlarmRecordWrapper {
|
|
|
|
|
|
alarmRecordItemVO.setTreatEndTime(alarmRecordItem.getTreatEndTime());
|
|
alarmRecordItemVO.setTreatEndTime(alarmRecordItem.getTreatEndTime());
|
|
alarmRecordItemVO.setIgnoreTime(alarmRecordItem.getIgnoreTime());
|
|
alarmRecordItemVO.setIgnoreTime(alarmRecordItem.getIgnoreTime());
|
|
|
|
+ alarmRecordItemVO.setRemark(alarmRecordItem.getRemark());
|
|
|
|
+ alarmRecordItemVO.setSupplement(alarmRecordItem.getSupplement());
|
|
|
|
|
|
return alarmRecordItemVO;
|
|
return alarmRecordItemVO;
|
|
}
|
|
}
|