From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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