From f1e25082a58c8cb57dd45d226d3a94f4af4a0677 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/entity/Device.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 757f78e..ec0b15f 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -32,12 +32,12 @@
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.longitude
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017
 	 */
-	private double longitude;
+	private Double longitude;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.latitude
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017
 	 */
-	private double latitude;
+	private Double latitude;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.mac
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017

--
Gitblit v1.8.0