From cea9aba8d0e4833bac428d071664cbe84e6180c9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 15 Jun 2018 09:47:49 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/entity/Device.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 6d98dfc..dae7f3d 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -76,6 +76,7 @@
*/
private Integer deviceVersionId;
private String isDelete;
+ private Integer professionId;
/**
* Sets the uid.
*
@@ -85,15 +86,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,11 +109,10 @@
private OperateUser operateUser;
@Transient
private DeviceVersion deviceVersion;
- //@Transient
- //private MonitorPoint monitorPoint;
+ @Transient
+ private MonitorPoint monitorPoint;
@Transient
private List<Integer> organizationIds;
-
- @Transient
- private MonitorPoint monitorpointDetail;
+ @Transient
+ private Profession profession;
}
\ No newline at end of file
--
Gitblit v1.8.0