From 94b2cfe8cdb5e8c343485b46921b554b192e1c7a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 18:22:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 289f788..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
@@ -58,7 +58,7 @@
@ApiModelProperty(value = "站点名称")
@TableField(exist = false)
- private Integer siteName;
+ private String siteName;
@ApiModelProperty(value = "合作商id", required = true)
@TableField("partner_id")
@@ -66,7 +66,7 @@
@ApiModelProperty(value = "合作商名称")
@TableField(exist = false)
- private Integer partnerName;
+ private String partnerName;
@ApiModelProperty(value = "生产商机构代码")
@TableField("manufacturer_code")
@@ -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