From cfc72c5a140e6f3dd750b28b9566c64c713806bc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 九月 2024 13:50:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TFaultMessage.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TFaultMessage.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TFaultMessage.java
index 3301e51..2fd9933 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TFaultMessage.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TFaultMessage.java
@@ -38,10 +38,16 @@
     @ApiModelProperty(value = "站点id")
     @TableField("site_id")
     private Integer siteId;
+    
+    @TableField(exist = false)
+    private String siteName;
 
     @ApiModelProperty(value = "充电桩id")
     @TableField("charging_pile_id")
     private Integer chargingPileId;
+    
+    @TableField(exist = false)
+    private String chargingPileName;
 
     @ApiModelProperty(value = "状态(1=离线,2=故障)")
     @TableField("status")

--
Gitblit v1.7.1