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 |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 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 c35ab2f..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
@@ -136,5 +136,38 @@
 	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