Merge branch 'qa_1.1' into dev

# Conflicts:
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java

@@ -16,6 +16,7 @@ public class MarkerCardResult extends BaseData {
 
     private List<MarkerOnlineCar> onlineCar;
     private List<MarkerExploreWay> exploreWay;
+    private long messageTime;
 
     public List<MarkerCarChat> getCarChat() {
         return carChat;
@@ -65,15 +66,11 @@ public class MarkerCardResult extends BaseData {
         this.dataType = dataType;
     }
 
-    @Override
-    public String toString() {
-        return "MarkerCardResult{" +
-                "dataType=" + dataType +
-                ", carChat=" + carChat +
-                ", exploreWay=" + exploreWay +
-                ", onlineCar=" + onlineCar +
-                ", shareMusic=" + shareMusic +
-                ", noveltyInfo=" + noveltyInfo +
-                '}';
+    public long getMessageTime() {
+        return messageTime;
+    }
+
+    public void setMessageTime(long messageTime) {
+        this.messageTime = messageTime;
     }
 }