diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsVibrationInstant.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsVibrationInstant.java
index 1528898..3fd3493 100644
--- a/os-ems/src/main/java/com/os/ems/record/domain/EmsVibrationInstant.java
+++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsVibrationInstant.java
@@ -3,6 +3,7 @@ package com.os.ems.record.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.os.ems.base.domain.EmsBaseMonitorInfo;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.os.common.annotation.Excel;
@@ -18,6 +19,18 @@ public class EmsVibrationInstant extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ /** 计量设备名称 */
+ @Excel(name = "计量设备名称")
+ private String monitorName;
+
+ public String getMonitorName() {
+ return monitorName;
+ }
+
+ public void setMonitorName(String monitorName) {
+ this.monitorName = monitorName;
+ }
+
/** 主键标识 */
private Long objId;
diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
index 3dc8cf8..87ca5e9 100644
--- a/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+