From aba833c7e94483639995f269aa00954e0bf4ade3 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 18 Jan 2018 15:30:45 +0800
Subject: [PATCH] 设备管理
---
src/main/java/com/moral/entity/Device.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index ca4ebc2..d180934 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -2,6 +2,9 @@
import java.util.Date;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+
import lombok.Data;
@@ -13,6 +16,7 @@
* 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
private Integer id;
/**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.name
@@ -69,7 +73,7 @@
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
*/
private Integer deviceVersionId;
-
+ private String isDelete;
/**
* Sets the uid.
*
@@ -97,14 +101,7 @@
return name;
}
- /**
- * Sets the monitorpoint.
- *
- * @param monitorpoint the new monitorpoint
- */
- public void setMonitorpoint(Integer monitorpoint) {
- this.monitorPointId = monitorpoint;
- }
+
/**
* Gets the status.
@@ -114,6 +111,10 @@
public String getStatus() {
return state;
}
-
-
+ @Transient
+ private OperateUser operateUser;
+ @Transient
+ private DeviceVersion deviceVersion;
+ @Transient
+ private MonitorPoint monitorPoint;
}
\ No newline at end of file
--
Gitblit v1.8.0