From e34d88ad7d3d950da12f032e6932ba14f868db72 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 21 Aug 2019 10:22:50 +0800
Subject: [PATCH] 修改大屏无人机地图弹窗显示不全问题，设置可拖动
---
src/main/java/com/moral/entity/Device.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index ec0b15f..1c01911 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -1,7 +1,9 @@
package com.moral.entity;
import java.util.Date;
+import java.util.List;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Transient;
@@ -12,11 +14,13 @@
* Instantiates a new device.
*/
@Data
-public class Device {/**
+public class Device {
+ /**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.id
* @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
@@ -74,6 +78,7 @@
*/
private Integer deviceVersionId;
private String isDelete;
+ private Integer professionId;
/**
* Sets the uid.
*
@@ -83,15 +88,6 @@
this.operateUserId = uid;
}
- /**
- * Sets the device name.
- *
- * @param device_name the new device name
- */
- public void setDevice_name(String device_name) {
- this.name = device_name;
- }
-
/**
* Gets the device name.
*
@@ -117,4 +113,10 @@
private DeviceVersion deviceVersion;
@Transient
private MonitorPoint monitorPoint;
+ @Transient
+ private List<Integer> organizationIds;
+ @Transient
+ private Profession profession;
+ @Transient
+ private DeviceProperty deviceProperty;
}
\ No newline at end of file
--
Gitblit v1.8.0