From f18586e102e88ae62ee5f447d18d00173e926b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 20 May 2020 15:57:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=8E=A2=E8=B7=AF?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AEID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../common/entity/MarkerExploreWay.java       | 30 ++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2dc54c489f..707ee6e613 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
index 073c45bee0..de2d743cca 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
@@ -10,6 +10,7 @@ import java.util.List;
 public class MarkerExploreWay implements Serializable {
 
     private String type;//卡片类型,
+    private String infoId;
     private String sn;
     private MarkerLocation location;//位置信息
     private int direction;//方位角度
@@ -121,21 +122,30 @@ public class MarkerExploreWay implements Serializable {
         this.userInfo = userInfo;
     }
 
+    public String getInfoId() {
+        return infoId;
+    }
+
+    public void setInfoId(String infoId) {
+        this.infoId = infoId;
+    }
+
     @Override
     public String toString() {
         return "MarkerExploreWay{" +
-                "addr='" + addr + '\'' +
-                ", canLive=" + canLive +
-                ", cityName='" + cityName + '\'' +
-                ", direction=" + direction +
-                ", distance=" + distance +
-                ", fileType=" + fileType +
-                ", generateTime=" + generateTime +
-                ", items=" + items +
-                ", location=" + location +
+                "type='" + type + '\'' +
+                ", infoId='" + infoId + '\'' +
                 ", sn='" + sn + '\'' +
-                ", type='" + type + '\'' +
+                ", location=" + location +
+                ", direction=" + direction +
+                ", canLive=" + canLive +
+                ", fileType=" + fileType +
+                ", addr='" + addr + '\'' +
+                ", generateTime=" + generateTime +
+                ", cityName='" + cityName + '\'' +
+                ", distance=" + distance +
                 ", userInfo=" + userInfo +
+                ", items=" + items +
                 '}';
     }
 }