From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/entity/MonitorPoint.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/entity/MonitorPoint.java b/src/main/java/com/moral/entity/MonitorPoint.java
index cbfbee8..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;
@@ -104,7 +106,7 @@
private Long townCode;
private Long villageCode;
-
- private Integer town_code;
- private Integer village_code;
+
+ @Transient
+ private List<Device> devices;
}
\ No newline at end of file
--
Gitblit v1.8.0