From 02ccfc21d5d4f767bbd92ecda89cdfcc3283728c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 11 六月 2025 08:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem into master
---
src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java b/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java
index 703b2f9..a11e48a 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/DevalarmDataHistory.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_alarm;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -40,6 +41,9 @@
@ApiModelProperty(value = "鍛婅ID")
private Integer almId;
+ @TableField(exist = false)
+ private String almName;
+
@ApiModelProperty(value = "鍛婅绛夌骇")
private Integer almLevel;
@@ -73,5 +77,15 @@
@ApiModelProperty(value = "鍛婅閲嶈绛夌骇[0:閲嶈锛�1:绱ф�")
private Integer almSeverity;
+ @TableField(exist = false)
+ private String stationName;
+ @TableField(exist = false)
+ private String provice;
+ @TableField(exist = false)
+ private String city;
+ @TableField(exist = false)
+ private String country;
+ @TableField(exist = false)
+ private String devName;
}
--
Gitblit v1.9.1