change-网页端连表查monitorName，增添EmsVibrationInstant的实体类和mapper对其支持

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;
 

os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="temperature"    column="temperature"    />
         <result property="recodeTime"    column="recodeTime"    />
         <result property="remark"    column="remark"    />
+        <result property="monitorName"    column="monitor_name"    />
     </resultMap>
 
     <sql id="selectEmsVibrationInstantVo">