From 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 24 Jul 2018 11:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/MonitorPoint.java | 4 ++--
1 files changed, 2 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..c9dc40d 100644
--- a/src/main/java/com/moral/entity/MonitorPoint.java
+++ b/src/main/java/com/moral/entity/MonitorPoint.java
@@ -102,6 +102,6 @@
@Transient
private Organization organization;
- private Integer town_code;
- private Integer village_code;
+ private Long townCode;
+ private Long villageCode;
}
\ No newline at end of file
--
Gitblit v1.8.0