From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/entity/MonitorPoint.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/entity/MonitorPoint.java b/src/main/java/com/moral/entity/MonitorPoint.java
index 89cba1f..6decda3 100644
--- a/src/main/java/com/moral/entity/MonitorPoint.java
+++ b/src/main/java/com/moral/entity/MonitorPoint.java
@@ -1,5 +1,7 @@
package com.moral.entity;
+import java.util.List;
+
import javax.persistence.Id;
import javax.persistence.Transient;
@@ -102,6 +104,9 @@
@Transient
private Organization organization;
- private Integer town_code;
- private Integer village_code;
+ private Long townCode;
+ private Long villageCode;
+
+ @Transient
+ private List<Device> devices;
}
\ No newline at end of file
--
Gitblit v1.8.0