From 04a4dbb679514beea73eb747fd0f18522ec91193 Mon Sep 17 00:00:00 2001
From: zangch <zangch@mesnac.com>
Date: Mon, 26 Aug 2024 14:23:33 +0800
Subject: [PATCH] =?UTF-8?q?change-=E7=BD=91=E9=A1=B5=E7=AB=AF=E8=BF=9E?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5monitorName=EF=BC=8C=E5=A2=9E=E6=B7=BBEmsVibr?=
 =?UTF-8?q?ationInstant=E7=9A=84=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=92=8Cmapper?=
 =?UTF-8?q?=E5=AF=B9=E5=85=B6=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../os/ems/record/domain/EmsVibrationInstant.java   | 13 +++++++++++++
 .../mapper/ems/record/EmsVibrationInstantMapper.xml |  1 +
 2 files changed, 14 insertions(+)

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"
         <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">