From c3e1f9b9af29647bd157f2ea268bc56b2d3b9df1 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 31 Aug 2020 14:47:46 +0800
Subject: [PATCH] 风场图update

---
 src/main/java/com/moral/entity/Device.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 0f170b7..a69aa52 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -3,6 +3,7 @@
 import java.util.Date;
 import java.util.List;
 
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Transient;
 
@@ -19,6 +20,7 @@
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017
 	 */
 	@Id
+	@GeneratedValue(generator = "JDBC")
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.name
@@ -76,7 +78,7 @@
 	 */
 	private Integer deviceVersionId;
 	private String isDelete;
-	private String professionId;
+	private Integer professionId;
 	/**
 	 * Sets the uid.
 	 *
@@ -113,5 +115,11 @@
 	private MonitorPoint monitorPoint;
 	@Transient
 	private List<Integer> organizationIds;
+    @Transient
+    private Profession profession;
+    @Transient
+    private DeviceProperty deviceProperty;
 
+	@Transient
+	private Boolean hasWindInfo;
 }
\ No newline at end of file

--
Gitblit v1.8.0