From 5d686103fbb4361bebc305c731c9358d038e2836 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 02 Nov 2017 13:41:24 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/task.git
---
src/main/java/com/moral/monitor/entity/Equipment.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/monitor/entity/Equipment.java b/src/main/java/com/moral/monitor/entity/Equipment.java
index 5f85f86..70a330c 100644
--- a/src/main/java/com/moral/monitor/entity/Equipment.java
+++ b/src/main/java/com/moral/monitor/entity/Equipment.java
@@ -32,7 +32,33 @@
private String monitorpoint;
private String ownerId;
+ public MonitorPoint getMonitorpointDetail() {
+ return monitorpointDetail;
+ }
+ public void setMonitorpointDetail(MonitorPoint monitorpointDetail) {
+ this.monitorpointDetail = monitorpointDetail;
+ }
+
+ public Organization getOwnerDetail() {
+ return ownerDetail;
+ }
+
+ public void setOwnerDetail(Organization ownerDetail) {
+ this.ownerDetail = ownerDetail;
+ }
+
+ public User getInstallerDetail() {
+ return installerDetail;
+ }
+
+ public void setInstallerDetail(User installerDetail) {
+ this.installerDetail = installerDetail;
+ }
+
+ private MonitorPoint monitorpointDetail;
+ private Organization ownerDetail;
+ private User installerDetail;
public Integer getId() {
return id;
}
--
Gitblit v1.8.0