From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001 From: 于紫祥_1901 <email@yuzixiang_1910> Date: Fri, 06 Nov 2020 15:37:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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