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/BattalarmDataHistory.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.java b/src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.java
index 3e7dd6f..8cde084 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattalarmDataHistory.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 almSignalId;
@@ -76,5 +80,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 battgroupName;//鐢垫睜缁勫悕绉�
}
--
Gitblit v1.9.1