From bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:11:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
index e1d69a9..fe22081 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
@@ -96,4 +96,8 @@
     @ApiModelProperty(value = "设备状态(1=工作中,2=离线,3=故障)")
     @TableField("status")
     private Integer status;
+    
+    @ApiModelProperty(value = "iotd设备id")
+    @TableField("iotd_device_id")
+    private String iotdDeviceId;
 }

--
Gitblit v1.7.1