Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/domain/TVibrationsensorData.java

@@ -64,6 +64,16 @@ public class TVibrationsensorData extends BaseEntity {
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date recodeTime;
 
+    private String monitorName;
+
+    public String getMonitorName() {
+        return monitorName;
+    }
+
+    public void setMonitorName(String monitorName) {
+        this.monitorName = monitorName;
+    }
+
     public Long getObjId() {
         return objId;
     }

ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml

@@ -14,6 +14,7 @@
         <result property="temperature" column="temperature"/>
         <result property="recodeTime" column="recodeTime"/>
         <result property="remark" column="remark"/>
+        <result property="monitorName" column="monitorName"/>
     </resultMap>
 
     <sql id="selectTVibrationsensorDataVo">