From c0ceef9f86c0abb288ade6a7770c02326848f8a4 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 06 二月 2025 13:58:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1 --- 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