From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
index 8a06736..83e882f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java
@@ -86,8 +86,8 @@
/**
* 空间坐标
*/
- @ApiModelProperty(value = "空间坐标")
- private String coordinate;
+// @ApiModelProperty(value = "空间坐标")
+// private String coordinate;
/**
* 菜单父主键
*/
@@ -100,15 +100,74 @@
private String addvcd;
private String street;
private String dtype;
+ @TableField("serialNumber")
private String serialNumber;
private String stype;
+ @TableField("channelNumber")
private String channelNumber;
private String pay;
+ @TableField("expireTime")
private String expireTime;
private String heartbeat;
private String province;
private String city;
private String district;
+ private String state;
+ private String reason;
+ @TableField("deptId")
+ private String deptId;
+ @TableField("onePhone")
+ private String onePhone;
+ @TableField("twoPhone")
+ private String twoPhone;
+ @TableField("ThreePhone")
+ private String ThreePhone;
+ @TableField("oneId")
+ private String oneId;
+ @TableField("twoId")
+ private String twoId;
+ @TableField("threeId")
+ private String threeId;
+ @TableField("oneContacts")
+ private String oneContacts;
+ @TableField("twoContacts")
+ private String twoContacts;
+ @TableField("ThreeContacts")
+ private String ThreeContacts;
+ /**
+ * 设备厂商名称
+ */
+ private String manufacturers;
+
+ /**
+ * 设备型号
+ */
+ @TableField("eq_model")
+ private String eqModel;
+
+ /**
+ * 产品id，onenetstudio 平台生成
+ */
+ @TableField("pro_id")
+ private String proId;
+
+ /**
+ * 设备秘钥，onenetstudio 平台生成
+ */
+ @TableField("eq_secret")
+ private String eqSecret;
+
+ /**
+ * 设备名称，onenetstudio 平台生成
+ */
+ @TableField("eq_name")
+ private String eqName;
+
+ /**
+ * 联网方式
+ */
+ @TableField("net_type")
+ private String netType;
}
--
Gitblit v1.9.3